|
@@ -47,11 +47,18 @@ class CmsContentTemplateSetRepository
|
|
$banner_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 0])->get();
|
|
$banner_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 0])->get();
|
|
$new_rule = [];
|
|
$new_rule = [];
|
|
foreach ($banner_rule->toArray() as $k => $v) {
|
|
foreach ($banner_rule->toArray() as $k => $v) {
|
|
- $new_rule[$k]['id'] = $v['id'];
|
|
|
|
- $new_rule[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'], true);
|
|
|
|
|
|
+// $new_rule[$k]['id'] = $v['id'];
|
|
|
|
+// $new_rule[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'], true);
|
|
|
|
+ $a = \GuzzleHttp\json_decode($v['rule'], true);
|
|
|
|
+ foreach ($a as $key=>$value){
|
|
|
|
+ $a[$key]['b_id'] = $v['id'];
|
|
|
|
+ $new_rule[$key]['id'] = $key;
|
|
|
|
+ $new_rule[$key]['rule'] = $value;
|
|
|
|
+
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- $group_array['content'][0]['rule'] = $new_rule;
|
|
|
|
|
|
|
|
|
|
+ $group_array['content'][0]['rule'] = $new_rule;
|
|
$subject_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 1])->get();
|
|
$subject_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 1])->get();
|
|
|
|
|
|
$new_rule1 = [];
|
|
$new_rule1 = [];
|