合并分支 'akun' 到 'master'

Akun



查看合并请求 !1344

@@ -111,7 +111,7 @@ class ProjectLogic extends BaseLogic
         //升级项目采集完成时间
         //升级项目采集完成时间
         $info['collect_time'] = $info['is_upgrade'] ? UpdateLog::getProjectUpdate($id) : '';
         $info['collect_time'] = $info['is_upgrade'] ? UpdateLog::getProjectUpdate($id) : '';
         //获取项目所属行业
         //获取项目所属行业
-        $info['industry'] = ProjectIndustryRelated::where('project_id', $id)->pluck('industry_id')->toArray();
+        $info['deploy_optimize']['industry'] = ProjectIndustryRelated::where('project_id', $id)->pluck('industry_id')->toArray();
 
 
         return $this->success($info);
         return $this->success($info);
     }
     }
@@ -182,8 +182,6 @@ class ProjectLogic extends BaseLogic
                 $this->saveProjectAfter($this->param['project_after']);
                 $this->saveProjectAfter($this->param['project_after']);
                 //单独保存小语种配置
                 //单独保存小语种配置
                 $this->saveMinorLanguages($this->param['minor_languages'] ?? [],$this->param['id']);
                 $this->saveMinorLanguages($this->param['minor_languages'] ?? [],$this->param['id']);
-                //单独保存行业信息
-                ProjectIndustryRelated::saveRelated($this->param['id'],$this->param['industry'] ?? []);
                 //同步图片文件
                 //同步图片文件
                 $this->syncImageFile($this->param['project_location'],$this->param['id']);
                 $this->syncImageFile($this->param['project_location'],$this->param['id']);
                 //同步信息表
                 //同步信息表
@@ -427,6 +425,8 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/8/30 13:45
      * @time   :2023/8/30 13:45
      */
      */
     protected function saveProjectDeployOptimize($deploy_optimize){
     protected function saveProjectDeployOptimize($deploy_optimize){
+        //单独保存行业信息
+        ProjectIndustryRelated::saveRelated($deploy_optimize['project_id'],$deploy_optimize['industry'] ?? []);
         $deployOptimizeModel = new DeployOptimize();
         $deployOptimizeModel = new DeployOptimize();
         if(isset($deploy_optimize['domain']) && !empty($deploy_optimize['domain'])){
         if(isset($deploy_optimize['domain']) && !empty($deploy_optimize['domain'])){
             //更改域名
             //更改域名