gx

@@ -36,7 +36,7 @@ class BTemplateLogic extends BaseLogic
     }
 
     /**
-     * @remark :获取当前选择的模板
+     * @remark :获取当前选择使用的模板
      * @name   :getModuleTemplate
      * @author :lyh
      * @method :post
@@ -47,8 +47,13 @@ class BTemplateLogic extends BaseLogic
         $info = $bSettingModel->read(['project_id'=>$this->user['project_id']]);
         $TemplateInfo = [];
         if($info !== false){
-            //查看当前模板是否已编辑保存
-            $TemplateInfo = $this->model->read(['template_id'=>$info['template_id'],'project_id'=>$this->user['project_id']]);
+            //查看当前模板是否已编辑保存web_template
+            $TemplateInfo = $this->model->read([
+                'template_id'=>$info['template_id'],
+                'source'=>$this->param['source'],
+                'project_id'=>$this->user['project_id'],
+                'source_id'=>$this->param['source_id'],
+            ]);
             if($TemplateInfo === false){
                 //获取模板详情
                 $ATemplateModel = new Template();
@@ -91,6 +96,15 @@ class BTemplateLogic extends BaseLogic
      * @time   :2023/6/29 11:05
      */
     public function templateSave(){
+        //查询当前模版是否已保存
+        $info = $this->model->read(
+            [
+                'project_id'=>$this->user['project_id'],
+                'source'=>$this->param['source'],
+                'source_id'=>$this->param['source_id'],
+                'template_id'=>$this->param['template_id'],
+            ]
+        );
         //字符串截取
         $this->param['head_html'] = characterTruncation($this->param['html'],'<header>','</header>');
         $this->param['main_html'] = characterTruncation($this->param['html'],'<main>','</main>');
@@ -98,11 +112,11 @@ class BTemplateLogic extends BaseLogic
         $this->param['head_css'] = characterTruncation($this->param['html'],'<style id="vvvebjs-header">','</style>');
         $this->param['main_css'] = characterTruncation($this->param['html'],'<style id="vvvebjs-style">','</style>');
         $this->param['footer_css'] = characterTruncation($this->param['html'],'<style id="vvvebjs-footer">','</style>');
-        if(isset($this->param['id']) && !empty($this->param['id'])){
-            $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
-        }else{
+        if($info === false){
             $this->param['project_id'] = $this->user['project_id'];
             $rs = $this->model->add($this->param);
+        }else{
+            $rs = $this->model->edit($this->param,['id'=>$info['id']]);
         }
         if($rs === false){
             $this->fail('error');

@@ -34,6 +34,8 @@ class TemplateRequest extends FormRequest
     {
         return [
             'html'=>'required',
+            'source'=>'required',
+            'source_id'=>'required',
             'template_id'=>'required',
             'section_list_id'=>'required',
         ];
@@ -44,6 +46,8 @@ class TemplateRequest extends FormRequest
         return [
             'html.required'=>'请填写html',
             'template_id.required'=>'模版id不能为空',
+            'source.required'=>'类型不能为空',
+            'source_id.required'=>'类型ID不能为空',
             'section_list_id.required'=>'所选择的模块',
         ];
     }