返回格式微调

app/Repositories/CmsContentTemplateSetRepository.php

@@ -25,7 +25,7 @@ class CmsContentTemplateSetRepository
      */
     public function preview($request)
     {
-        $temalates = $this->cmsContentTemplate->select('title', 'id')->where(['city_id' => $request['city_id'], 'apply_type' => $request['type'], 'is_open' => 1,'status'=>1])->orderBy('id','desc')->first();
+        $temalates = $this->cmsContentTemplate->select('title', 'id')->where(['city_id' => $request['city_id'], 'apply_type' => $request['type'], 'is_open' => 1,'status'=>1,'deleted_at'=>null])->orderBy('id','desc')->first();
         if (!$temalates) {
             throw new HttpException(500, '没有找到对应模板');
         }
@@ -50,11 +50,12 @@ class CmsContentTemplateSetRepository
 //            $new_rule[$k]['id'] = $v['id'];
 //            $new_rule[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'], true);
             $decode_banner = \GuzzleHttp\json_decode($v['rule'], true);
-            foreach ($decode_banner as $key=>$value){
-                $new_rule[$key]['id'] = $key;
-                $new_rule[$key]['rule'] = $value;
-                $new_rule[$key]['rule']['b_id'] = $v['id'];
-
+            if (count($decode_banner)>0) {
+                foreach ($decode_banner as $key=>$value){
+                    $new_rule[$key]['id'] = $key;
+                    $new_rule[$key]['rule'] = $value;
+                    $new_rule[$key]['rule']['b_id'] = $v['id'];
+                }
             }
         }