test

app/Repositories/CmsContentTemplateSetRepository.php

@@ -50,7 +50,18 @@ class CmsContentTemplateSetRepository {
         }
         $group_array['content'][0]['rule'] = $new_rule;
 
-        $group_array['content'][1]['area_type'] ="special";
+        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 = [];
@@ -58,9 +69,9 @@ class CmsContentTemplateSetRepository {
             $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]['rule'] = $new_rule;
 
-        $group_array['content'][2]['area_type'] ="floor";
+        $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 = [];
         foreach ($floor_rule->toArray() as $k=>$v){
@@ -84,18 +95,7 @@ class CmsContentTemplateSetRepository {
             }
 
         }
-        $group_array['content'][2]['rule'] = $new_rule;
-
-        if ($request['type'] == 1){
-            $group_array['content'][3]['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'][3]['rule'] = $new_rule;
-        }
+        $group_array['content'][3]['rule'] = $new_rule;
 
         return $group_array;