增加判断

app/Repositories/CmsContentTemplateSetRepository.php

@@ -562,8 +562,8 @@ class CmsContentTemplateSetRepository
         $new_rule = [];
         foreach ($banner_rule->toArray() as $k => $v) {
 //            if (count(json_decode($v['rule'])) > 0) {
-                $new_rule[$k]['id'] = $v['id'];
-                $new_rule[$k]['rule'] = json_decode($v['rule'], true);
+            $new_rule[$k]['id'] = $v['id'];
+            $new_rule[$k]['rule'] = json_decode($v['rule'], true);
 //            }
         }
         $group_array['content'][0]['rule'] = $new_rule;
@@ -574,19 +574,25 @@ class CmsContentTemplateSetRepository
         $new_rule = [];
         foreach ($all_subject as $k => $v) {
 //            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);
+            $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'];
-            $group_array['content'][$k + 1]['rule'] = array($new_rule[$k]['rule']);
+        if (count($new_rule) > 0) {
+            foreach ($new_rule as $k => $v) {
+                $group_array['content'][$k + 1]['area_type'] = $new_rule[$k]['area_type'];
+                $group_array['content'][$k + 1]['rule'] = array($new_rule[$k]['rule']);
+            }
+        } else {
+            $group_array['content'][1]['area_type'] = 4;
+            $group_array['content'][1]['rule'] = [];
+            $group_array['content'][2]['area_type'] = 5;
+            $group_array['content'][2]['rule'] = [];
         }
 
-        $group_array['content'][$count + 1]['area_type'] = 2;
         $floor_rule = $this->cmsContentTemplateSet->select('id', 'rule', 'floor_img')->where(['tpl_id' => $request['tpl_id'], 'area_type' => 2])->get();
         $new_rule = [];
         foreach ($floor_rule->toArray() as $k => $v) {
@@ -609,7 +615,13 @@ class CmsContentTemplateSetRepository
                 unset($v['link_type']);
             }
         }
-        $group_array['content'][$count + 1]['rule'] = $new_rule;
+        if ($count != 0) {
+            $group_array['content'][$count + 1]['area_type'] = 2;
+            $group_array['content'][$count + 1]['rule'] = $new_rule;
+        } else {
+            $group_array['content'][3]['area_type'] = 2;
+            $group_array['content'][3]['rule'] = $new_rule;
+        }
 
         return $group_array;
     }