瀏覽代碼

格式修改

durong 5 年之前
父節點
當前提交
27fddead9e
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      app/Repositories/CmsContentTemplateSetRepository.php

+ 3 - 2
app/Repositories/CmsContentTemplateSetRepository.php

@@ -570,10 +570,10 @@ class CmsContentTemplateSetRepository
 
         $all_subject = $this->cmsContentTemplateSet->select('id', 'rule', 'sort', 'name', 'floor_img', 'area_type')->where(['tpl_id' => $request['tpl_id']])->whereIn('area_type', [4, 5])->orderBy('sort', 'asc')->get();
         $all_subject = $all_subject->toArray();
-
         $count = count($all_subject);
         $new_rule = [];
         foreach ($all_subject as $k => $v) {
+            $new_rule[$k]['rule'] = [];
             if (count(json_decode($v['rule'])) > 0) {
                 $new_rule[$k]['area_type'] = $v['area_type'];
                 $new_rule[$k]['rule']['id'] = $v['id'];
@@ -583,7 +583,8 @@ class CmsContentTemplateSetRepository
             }
         }
         foreach ($new_rule as $k => $v) {
-            $group_array['content'][$k + 1] = $new_rule[$k];
+            $group_array['content'][$k + 1]['area_type'] = $new_rule[$k]['area_type'];
+            $group_array['content'][$k + 1]['rule'] = array($new_rule[$k]['rule']);
         }
 
         $group_array['content'][$count + 1]['area_type'] = 2;