修改顺序

app/Repositories/CmsContentTemplateSetRepository.php

@@ -50,35 +50,21 @@ class CmsContentTemplateSetRepository {
         }
         $group_array['content'][0]['rule'] = $new_rule;
 
-        if ($request['type'] == 1){
-            $group_array['content'][1]['area_type'] ="category";
-            $category_rule = $this->cmsContentTemplateSet->select('id','rule')->where(['tpl_id'=>$temalates->id,'area_type'=>3])->get();
-            $new_rule = [];
-            foreach ($category_rule->toArray() as $k=>$v){
-                $new_rule[$k]['id'] = $v['id'];
-                $new_rule[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'],true);
-            }
-            $group_array['content'][1]['rule'] = $new_rule;
-        }
-
-        $group_array['content'][2]['area_type'] ="special";
         $subject_rule = $this->cmsContentTemplateSet->select('id','rule')->where(['tpl_id'=>$temalates->id,'area_type'=>1])->get();
 
-        $new_rule = [];
+        $new_rule1 = [];
         foreach ($subject_rule->toArray() as $k=>$v){
-            $new_rule[$k]['id'] = $v['id'];
-            $new_rule[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'],true);
+            $new_rule1[$k]['id'] = $v['id'];
+            $new_rule1[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'],true);
         }
-        $group_array['content'][2]['rule'] = $new_rule;
 
-        $group_array['content'][3]['area_type'] ="floor";
         $floor_rule = $this->cmsContentTemplateSet->select('id','rule')->where(['tpl_id'=>$temalates->id,'area_type'=>2])->get();
-        $new_rule = [];
+        $new_rule2 = [];
         foreach ($floor_rule->toArray() as $k=>$v){
-            $new_rule[$k]['id'] = $v['id'];
-            $new_rule[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'],true);
+            $new_rule2[$k]['id'] = $v['id'];
+            $new_rule2[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'],true);
         }
-        foreach ($new_rule as $k=>$v){
+        foreach ($new_rule2 as $k=>$v){
             if($v){
                 $rules = $v['rule'];
                 $show_type = $this->cmsSubject->select('show_type')->where('id', $rules['link_url'])->first();
@@ -93,12 +79,29 @@ class CmsContentTemplateSetRepository {
                 unset($rules['link_url']);
                 unset($v['link_type']);
             }
+        }
 
+        if ($request['type'] == 1){
+            $group_array['content'][1]['area_type'] ="category";
+            $category_rule = $this->cmsContentTemplateSet->select('id','rule')->where(['tpl_id'=>$temalates->id,'area_type'=>3])->get();
+            $new_rule3 = [];
+            foreach ($category_rule->toArray() as $k=>$v){
+                $new_rule3[$k]['id'] = $v['id'];
+                $new_rule3[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'],true);
+            }
+            $group_array['content'][1]['rule'] = $new_rule3;
+            $group_array['content'][2]['area_type'] ="special";
+            $group_array['content'][2]['rule'] = $new_rule1;
+            $group_array['content'][3]['area_type'] ="floor";
+            $group_array['content'][3]['rule'] = $new_rule2;
+        }else{
+            $group_array['content'][1]['area_type'] ="special";
+            $group_array['content'][1]['rule'] = $new_rule1;
+            $group_array['content'][2]['area_type'] ="floor";
+            $group_array['content'][2]['rule'] = $new_rule2;
         }
-        $group_array['content'][3]['rule'] = $new_rule;
 
         return $group_array;
-
     }
 
     public function getTemplate($cityId){