gx

@@ -528,10 +528,11 @@ class BTemplateLogic extends BaseLogic
                 $is_custom = $is_list = 0;
             }
             //查看当前数据是否还存在
-            $condition = ['project_id'=>$this->user['project_id'],'template_id'=>$template_id,'is_list'=>$is_list,'is_custom'=>$is_custom,'source'=>$typeSource,'common_type'=>$type];
+            $condition = ['template_id'=>$template_id,'is_list'=>$is_list,'is_custom'=>$is_custom,'source'=>$typeSource,'common_type'=>$type];
             $info = $templateComModel->read($condition);
             if($info === false){
                 $data = array_merge($param,$condition);
+                $data['project_id'] = $this->user['project_id'];
                 $templateComModel->add($data);
             }else{
                 $templateComModel->edit($param,$condition);

@@ -217,10 +217,11 @@ class InitHtmlLogic extends BaseLogic
                 $is_custom = $is_list = 0;
             }
             //查看当前数据是否还存在
-            $condition = ['project_id'=>$this->user['project_id'],'template_id'=>$template_id,'is_list'=>$is_list,'is_custom'=>$is_custom,'source'=>$typeSource,'common_type'=>$type];
+            $condition = ['template_id'=>$template_id,'is_list'=>$is_list,'is_custom'=>$is_custom,'source'=>$typeSource,'common_type'=>$type];
             $info = $templateComModel->read($condition);
             if($info === false){
                 $data = array_merge($param,$condition);
+                $data['project_id'] = $this->user['project_id'];
                 $templateComModel->add($data);
             }else{
                 $templateComModel->edit($param,$condition);
@@ -342,7 +343,7 @@ class InitHtmlLogic extends BaseLogic
      */
     public function getCustomizeTemplateComHtml($type,$is_custom,$is_list,$template_id = 0){
         $data = ['head_html'=>'','head_style'=>'','footer_html'=>'','footer_style'=>'','other'=>''];
-        $param = ['template_id'=>$template_id,'project_id'=>$this->user['project_id'],'type'=>$type,'is_custom'=>$is_custom,'is_list'=>$is_list];
+        $param = ['template_id'=>$template_id,'type'=>$type,'is_custom'=>$is_custom,'is_list'=>$is_list];
         $commonTemplateModel = new BTemplateCom();
         $commonList = $commonTemplateModel->list($param);
         if(!empty($commonList)){
@@ -369,7 +370,7 @@ class InitHtmlLogic extends BaseLogic
      * @time   :2023/12/13 15:39
      */
     public function handleAllHtml($commonInfo,$html){
-        if(!empty($commonInfo)){
+        if(!empty($commonInfo['head_html']) && !empty($commonInfo['footer_html'])){
             $html = preg_replace('/<header\b[^>]*>(.*?)<\/header>/s', $commonInfo['head_html'], $html);
             $html = preg_replace('/<footer\b[^>]*>(.*?)<\/footer>/s', $commonInfo['footer_html'], $html);
             $html = preg_replace('/<style id="globalsojs-header">(.*?)<\/style>/s', $commonInfo['head_css'], $html);