合并分支 'develop' 到 'master'

Develop



查看合并请求 !498

@@ -33,9 +33,8 @@ 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']);
+//        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['is_custom'] = 0;
         $this->map['is_custom'] = 0;
         $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']);
         if(!empty($lists['list'])){
         if(!empty($lists['list'])){

@@ -113,7 +113,7 @@ class CustomTemplateLogic extends BaseLogic
             $this->param['html_style'] = characterTruncation($html,'/<style id="globalsojs-styles">(.*?)<\/style>/s');
             $this->param['html_style'] = characterTruncation($html,'/<style id="globalsojs-styles">(.*?)<\/style>/s');
             $this->setTemplateLog($bSettingInfo['template_id'],$html,$this->param['id']);
             $this->setTemplateLog($bSettingInfo['template_id'],$html,$this->param['id']);
         }
         }
-        $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
+        $rs = $this->model->edit($this->param,['id'=>$this->param['id'],'project_id'=>$this->user['project_id']]);
         if($rs === false){
         if($rs === false){
             $this->fail('系统错误，请联系管理');
             $this->fail('系统错误，请联系管理');
         }
         }