gx

@@ -69,7 +69,8 @@ class Demo extends Command
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
             ProjectServer::useProject($v['id']);
-            $this->saveTemplateCom();
+            DB::table('gl_web_template_com')->truncate();
+            $this->saveTemplateCom($v['id']);
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
@@ -79,31 +80,32 @@ class Demo extends Command
         //获取当前项目选择的模版
         //获取当前项目选择的模版
         $settingModel = new Setting();
         $settingModel = new Setting();
         $settingInfo = $settingModel->read(['project_id'=>$project_id]);
         $settingInfo = $settingModel->read(['project_id'=>$project_id]);
+        echo date('Y-m-d H:i:s') . '设置的模版：'.json_encode($settingInfo) . PHP_EOL;
         if($settingInfo !== false){
         if($settingInfo !== false){
             $templateCommonModel = new BTemplateCommon();
             $templateCommonModel = new BTemplateCommon();
-            $commonList = $templateCommonModel->list(['id'=>1,'template_id'=>$settingModel['template_id'],'is_custom'=>0]);
+            $commonList = $templateCommonModel->list(['template_id'=>['in',[$settingInfo['template_id'],0]]]);
             if(!empty($commonList)){
             if(!empty($commonList)){
                 foreach ($commonList as $v){
                 foreach ($commonList as $v){
-                    $typeArr = [BTemplate::COMMON_HEAD, BTemplate::COMMON_FOOTER, BTemplate::COMMON_OTHER];
+                    $typeArr = [1, 2, 3];
                     foreach ($typeArr as $type){
                     foreach ($typeArr as $type){
-                        if($type == BTemplate::COMMON_HEAD){
+                        if($type == 1){
                             $headData = [
                             $headData = [
                                 'project_id'=>$v['project_id'],
                                 'project_id'=>$v['project_id'],
                                 'source'=>$v['type'] == 1 ? 99 : $v['type'],
                                 'source'=>$v['type'] == 1 ? 99 : $v['type'],
-                                'common_type'=>BTemplate::COMMON_HEAD,
+                                'common_type'=>1,
                                 'template_id'=>$v['template_id'],
                                 'template_id'=>$v['template_id'],
                                 'html'=>$v['head_html'],
                                 'html'=>$v['head_html'],
                                 'html_style'=>$v['head_css'],
                                 'html_style'=>$v['head_css'],
                                 'is_custom'=>$v['is_custom'],
                                 'is_custom'=>$v['is_custom'],
-                                'is_list'=>$v['list']
+                                'is_list'=>$v['is_list']
                             ];
                             ];
                             $templateComModel = new BTemplateCom();
                             $templateComModel = new BTemplateCom();
                             $templateComModel->add($headData);
                             $templateComModel->add($headData);
-                        }elseif ($type == BTemplate::COMMON_FOOTER){
+                        }elseif ($type == 2){
                             $footerData = [
                             $footerData = [
                                 'project_id'=>$v['project_id'],
                                 'project_id'=>$v['project_id'],
                                 'source'=>$v['type'] == 1 ? 99 : $v['type'],
                                 'source'=>$v['type'] == 1 ? 99 : $v['type'],
-                                'common_type'=>BTemplate::COMMON_FOOTER,
+                                'common_type'=>2,
                                 'template_id'=>$v['template_id'],
                                 'template_id'=>$v['template_id'],
                                 'html'=>$v['footer_html'],
                                 'html'=>$v['footer_html'],
                                 'html_style'=>$v['footer_css'],
                                 'html_style'=>$v['footer_css'],
@@ -112,11 +114,11 @@ class Demo extends Command
                             ];
                             ];
                             $templateComModel = new BTemplateCom();
                             $templateComModel = new BTemplateCom();
                             $templateComModel->add($footerData);
                             $templateComModel->add($footerData);
-                        }elseif ($type == BTemplate::COMMON_OTHER){
+                        }elseif ($type == 3){
                             $otherData = [
                             $otherData = [
                                 'project_id'=>$v['project_id'],
                                 'project_id'=>$v['project_id'],
                                 'source'=>$v['type'] == 1 ? 99 : $v['type'],
                                 'source'=>$v['type'] == 1 ? 99 : $v['type'],
-                                'common_type'=>BTemplate::COMMON_OTHER,
+                                'common_type'=>3,
                                 'template_id'=>$v['template_id'],
                                 'template_id'=>$v['template_id'],
                                 'html'=>$v['other'],
                                 'html'=>$v['other'],
                                 'html_style'=>null,
                                 'html_style'=>null,