gx

@@ -17,7 +17,7 @@ class BTemplateController extends BaseController
      * @time   :2023/6/29 9:21
      * @time   :2023/6/29 9:21
      */
      */
     public function publicTemplateLists(BTemplateLogic $BTemplateLogic){
     public function publicTemplateLists(BTemplateLogic $BTemplateLogic){
-        $lists = $BTemplateLogic->publicTemplateLists($this->map,$this->order);
+        $lists = $BTemplateLogic->publicTemplateLists($this->map,$this->page,$this->row,$this->order);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 

@@ -29,9 +29,9 @@ class BTemplateLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/6/29 9:34
      * @time   :2023/6/29 9:34
      */
      */
-    public function publicTemplateLists($map,$order = 'created_at',$filed = ['id','name','image','created_at']){
+    public function publicTemplateLists($map,$page,$row,$order = 'created_at',$filed = ['id','name','image','created_at']){
         $templateModel = new Template();
         $templateModel = new Template();
-        $lists = $templateModel->list($map,$order,$filed);
+        $lists = $templateModel->lists($map,$page,$row,$order,$filed);
         return $this->success($lists);
         return $this->success($lists);
     }
     }
 
 
@@ -50,9 +50,9 @@ class BTemplateLogic extends BaseLogic
             //查看当前模板是否已编辑保存web_template
             //查看当前模板是否已编辑保存web_template
             $TemplateInfo = $this->model->read([
             $TemplateInfo = $this->model->read([
                 'template_id'=>$info['template_id'],
                 'template_id'=>$info['template_id'],
-                'source'=>$this->param['source'],
+                'source'=>!isset($this->param['source']) ? 1 : $this->param['source'],
                 'project_id'=>$this->user['project_id'],
                 'project_id'=>$this->user['project_id'],
-                'source_id'=>$this->param['source_id'],
+                'source_id'=>!isset($this->param['source_id']) ? 0 : $this->param['source_id'],
             ]);
             ]);
             if($TemplateInfo === false){
             if($TemplateInfo === false){
                 //获取模板详情
                 //获取模板详情