gx

@@ -33,6 +33,7 @@ class BTemplateLogController extends BaseController
      * @time   :2023/8/23 11:05
      * @time   :2023/8/23 11:05
      */
      */
     public function lists(BTemplateLog $bTemplateLog){
     public function lists(BTemplateLog $bTemplateLog){
+        unset($this->map['template_id']);
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['source'] = 1;
         $this->map['source'] = 1;
         $lists = $bTemplateLog->lists($this->map,$this->page,$this->row,$this->order,['id','template_id','operator_id','source','created_at','updated_at']);
         $lists = $bTemplateLog->lists($this->map,$this->page,$this->row,$this->order,['id','template_id','operator_id','source','created_at','updated_at']);

@@ -49,6 +49,7 @@ class BTemplateLogLogic extends BaseLogic
         if($settingInfo === false){
         if($settingInfo === false){
             $this->fail('请先选择模版');
             $this->fail('请先选择模版');
         }
         }
+        //切换模版
         if($info['template_id'] != $settingInfo['template_id']){
         if($info['template_id'] != $settingInfo['template_id']){
             $bSettingModel->edit(['template_id'=>$info['template_id']],['id'=>$settingInfo['id']]);
             $bSettingModel->edit(['template_id'=>$info['template_id']],['id'=>$settingInfo['id']]);
         }
         }
@@ -58,11 +59,10 @@ class BTemplateLogLogic extends BaseLogic
             $BTemplateModel->edit($data,['template_id'=>$info['template_id'],'source'=>$info['source'],'source_id'=>$info['source_id']]);
             $BTemplateModel->edit($data,['template_id'=>$info['template_id'],'source'=>$info['source'],'source_id'=>$info['source_id']]);
             $commonData = $this->setCommonParam($info);
             $commonData = $this->setCommonParam($info);
             $commonTemplateModel = new BTemplateCommon();
             $commonTemplateModel = new BTemplateCommon();
-            $commonTemplateModel->edit($commonData,['template_id'=>$info['template_id'],'project_id'=>$this->user['project_id']]);
+            $commonTemplateModel->edit($commonData,['template_id'=>$info['template_id'],'type'=>1,'project_id'=>$this->user['project_id']]);
         }catch (\Exception $e){
         }catch (\Exception $e){
             $this->fail('系统错误，请联系管理员');
             $this->fail('系统错误，请联系管理员');
         }
         }
-        //同步更新公共头和底
         return $this->success();
         return $this->success();
     }
     }