duqinya 6 rokov pred
rodič
commit
29860bab4b

+ 4 - 4
app/Repositories/CmsContentTemplateSetRepository.php

@@ -44,7 +44,7 @@ class CmsContentTemplateSetRepository
 
         $group_array['content'][0]['area_type'] = "banner";
 
-        $banner_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 0])->get();
+        $banner_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 0,'status'=>1])->get();
         $new_rule = [];
         foreach ($banner_rule->toArray() as $k => $v) {
 //            $new_rule[$k]['id'] = $v['id'];
@@ -59,7 +59,7 @@ class CmsContentTemplateSetRepository
         }
 
         $group_array['content'][0]['rule'] = $new_rule;
-        $subject_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 1])->get();
+        $subject_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 1,'status'=>1])->get();
 
         $new_rule1 = [];
         foreach ($subject_rule->toArray() as $k => $v) {
@@ -67,7 +67,7 @@ class CmsContentTemplateSetRepository
             $new_rule1[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'], true);
         }
 
-        $floor_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 2])->get();
+        $floor_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 2,'status'=>1])->get();
         $new_rule2 = [];
         foreach ($floor_rule->toArray() as $k => $v) {
             $new_rule2[$k]['id'] = $v['id'];
@@ -93,7 +93,7 @@ class CmsContentTemplateSetRepository
 
         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();
+            $category_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 3,'status'=>1])->get();
             $new_rule3 = [];
             foreach ($category_rule->toArray() as $k => $v) {
                 $new_rule3[$k]['id'] = $v['id'];