duqinya 6 роки тому
батько
коміт
c4d1bbff02
1 змінених файлів з 7 додано та 2 видалено
  1. 7 2
      app/Repositories/CmsContentTemplateRepository.php

+ 7 - 2
app/Repositories/CmsContentTemplateRepository.php

@@ -4,6 +4,7 @@ namespace App\Repositories;
 
 
 use App\Models\CmsContentTemplate;
+use App\Models\CmsContentTemplateSet;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class CmsContentTemplateRepository {
@@ -31,7 +32,7 @@ class CmsContentTemplateRepository {
                 'status','=',$request['status'],
             ];
         }
-        return $this->cmsContentTemplate->where($where)->orderBy('id', 'asc')->paginate($perPage);
+        return $this->cmsContentTemplate->where($where)->where('status',1)->orderBy('id', 'asc')->paginate($perPage);
 
 
     }
@@ -53,7 +54,7 @@ class CmsContentTemplateRepository {
             'city_name' => $request['city_name'],
             'apply_type' => $request['apply_type'],
             'is_open' => 0,
-            'status' => 0
+            'status' => 1
         ];
         if ($request['city_id'] == 610100){
             $subject['is_open'] = 1;
@@ -77,6 +78,10 @@ class CmsContentTemplateRepository {
         if ($request['is_open'] == 1 && $template_id->status == 0){
             throw new HttpException(500, '请先配置内容并发布之后再开启');
         }
+        $template = CmsContentTemplateSet::where('tpl_id',$request['id'])->get();
+        if (count($template) == 0){
+            throw new HttpException(500, '配置内容为空无法开启');
+        }
 
         $template_id->is_open = $request['is_open'];
         $template_id->updated_at = date('Y-m-d H:i:s');