修改返回数据

app/Repositories/CmsContentTemplateRepository.php

@@ -18,15 +18,17 @@ class CmsContentTemplateRepository {
         $where = [];
         if (isset($request['is_open'])){
             $where[] = ['is_open','=',$request['is_open']];
+            return $this->cmsContentTemplate->where($where)->orderBy('id', 'asc')->paginate($perPage);
+
         }
         if (isset($request['city_id'])){
             $where[] = [
                 'city_id','=',$request['city_id'],
             ];
+            return $this->cmsContentTemplate->where($where)->where('is_open','=',1)->orderBy('id', 'asc')->paginate($perPage);
 
         }
 
-        return $this->cmsContentTemplate->where($where)->where('is_open','=',1)->orderBy('id', 'asc')->paginate($perPage);
 
     }