Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -240,8 +240,8 @@ class ProductController extends BaseController
         }
         }
         $v['status_text'] = Product::statusMap()[$v['status']] ?? '';
         $v['status_text'] = Product::statusMap()[$v['status']] ?? '';
         //获取当前用户选择的模版
         //获取当前用户选择的模版
-        $template_id = $this->getTemplateId(Bemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL);
-        $v['is_renovation']  =  $this->getIsRenovation(Bemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL,$template_id,$v['id']);
+        $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL);
+        $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL,$template_id,$v['id']);
         $v['url'] = $this->user['domain'].$v['route'];
         $v['url'] = $this->user['domain'].$v['route'];
         //获取当前数据扩展字段及值
         //获取当前数据扩展字段及值
         $v['extend'] = $this->getExtendInfo($v['id']);
         $v['extend'] = $this->getExtendInfo($v['id']);

@@ -418,8 +418,8 @@ class ProjectLogic extends BaseLogic
                 'role_menu'=>implode(',',$ids),
                 'role_menu'=>implode(',',$ids),
                 'project_id'=>$project_id,
                 'project_id'=>$project_id,
                 'type'=>1,
                 'type'=>1,
-                'operator_id'=>$this->manager['id'],
-                'create_id'=>$this->manager['id'],
+                'operator_id'=>0,
+                'create_id'=>0,
             ];
             ];
             $roleModel->add($data);
             $roleModel->add($data);
         }
         }

@@ -119,7 +119,7 @@ class ProjectServer extends BaseService
      * @method :post
      * @method :post
      * @time   :2023/12/29 9:34
      * @time   :2023/12/29 9:34
      */
      */
-    public function initModule($project_id){
+    public static function initModule($project_id){
         $info = DB::connection('custom_mysql')->table('gl_custom_module')->first();
         $info = DB::connection('custom_mysql')->table('gl_custom_module')->first();
         if(empty($info)){
         if(empty($info)){
             $data = [
             $data = [