|
@@ -67,18 +67,21 @@ class CmsContentTemplateSetRepository {
|
|
|
$new_rule[]['rule'] = \GuzzleHttp\json_decode($v['rule'],true);
|
|
|
}
|
|
|
foreach ($new_rule as $k=>$v){
|
|
|
- $rules = $v['rule'];
|
|
|
- $show_type = $this->cmsSubject->select('show_type')->where('id', $rules['link_url'])->first();
|
|
|
- $product = $this->cmsSubjectProduct->where('subject_id', $rules['link_url'])->orderBy('sort', 'asc')->get();
|
|
|
- $pro_array = $product->toArray();
|
|
|
- $res_id = implode(",", array_column($pro_array, 'id'));
|
|
|
- $new_rule[$k]['product_id'] = $res_id;
|
|
|
- $new_rule[$k]['subject_id'] = $rules['link_url'];
|
|
|
- $new_rule[$k]['show_type'] = $show_type->show_type ?? '';
|
|
|
- unset($v['url']);
|
|
|
- unset($v['show_num']);
|
|
|
- unset($rules['link_url']);
|
|
|
- unset($v['link_type']);
|
|
|
+ if($v){
|
|
|
+ $rules = $v['rule'];
|
|
|
+ $show_type = $this->cmsSubject->select('show_type')->where('id', $rules['link_url'])->first();
|
|
|
+ $product = $this->cmsSubjectProduct->where('subject_id', $rules['link_url'])->orderBy('sort', 'asc')->get();
|
|
|
+ $pro_array = $product->toArray();
|
|
|
+ $res_id = implode(",", array_column($pro_array, 'id'));
|
|
|
+ $new_rule[$k]['product_id'] = $res_id;
|
|
|
+ $new_rule[$k]['subject_id'] = $rules['link_url'];
|
|
|
+ $new_rule[$k]['show_type'] = $show_type->show_type ?? '';
|
|
|
+ unset($v['url']);
|
|
|
+ unset($v['show_num']);
|
|
|
+ unset($rules['link_url']);
|
|
|
+ unset($v['link_type']);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
$group_array['content'][2]['rule'] = $new_rule;
|
|
|
|