|
@@ -561,10 +561,10 @@ class CmsContentTemplateSetRepository
|
|
|
$banner_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $request['tpl_id'], 'area_type' => 0])->orderBy('id', 'desc')->limit(1)->get();
|
|
|
$new_rule = [];
|
|
|
foreach ($banner_rule->toArray() as $k => $v) {
|
|
|
- if (count(json_decode($v['rule'])) > 0) {
|
|
|
+// if (count(json_decode($v['rule'])) > 0) {
|
|
|
$new_rule[$k]['id'] = $v['id'];
|
|
|
$new_rule[$k]['rule'] = json_decode($v['rule'], true);
|
|
|
- }
|
|
|
+// }
|
|
|
}
|
|
|
$group_array['content'][0]['rule'] = $new_rule;
|
|
|
|
|
@@ -573,13 +573,13 @@ class CmsContentTemplateSetRepository
|
|
|
$count = count($all_subject);
|
|
|
$new_rule = [];
|
|
|
foreach ($all_subject as $k => $v) {
|
|
|
- if (count(json_decode($v['rule'])) > 0) {
|
|
|
+// if (count(json_decode($v['rule'])) > 0) {
|
|
|
$new_rule[$k]['area_type'] = $v['area_type'];
|
|
|
$new_rule[$k]['rule']['id'] = $v['id'];
|
|
|
$new_rule[$k]['rule']['name'] = $v['name'];
|
|
|
$new_rule[$k]['rule']['floor_img'] = $v['floor_img'];
|
|
|
$new_rule[$k]['rule']['rule'] = json_decode($v['rule'], true);
|
|
|
- }
|
|
|
+// }
|
|
|
}
|
|
|
foreach ($new_rule as $k => $v) {
|
|
|
$group_array['content'][$k + 1]['area_type'] = $new_rule[$k]['area_type'];
|