合并分支 'lyh-server' 到 'master'

gxai



查看合并请求 !1810

@@ -87,7 +87,7 @@ class DomainInfoLogic extends BaseLogic
         //查看当前域名是否有项目在使用
         //查看当前域名是否有项目在使用
         if($this->param['status'] != $this->model::STATUS_ONE){
         if($this->param['status'] != $this->model::STATUS_ONE){
             $info = $this->model->read(['id'=>$this->param['id']]);
             $info = $this->model->read(['id'=>$this->param['id']]);
-            if($info === false){
+            if($info['project_id'] != 0){
                 $this->fail('当前域名有项目正在使用中');
                 $this->fail('当前域名有项目正在使用中');
             }
             }
         }
         }

@@ -533,7 +533,7 @@ class ProjectLogic extends BaseLogic
         //单独保存行业信息
         //单独保存行业信息
         ProjectIndustryRelated::saveRelated($deploy_optimize['project_id'],$deploy_optimize['industry'] ?? []);
         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'])){
             //更改域名
             //更改域名
             $this->editDomainStatus($deploy_optimize['domain'],$deploy_optimize['project_id']);
             $this->editDomainStatus($deploy_optimize['domain'],$deploy_optimize['project_id']);
         }
         }
@@ -919,11 +919,7 @@ class ProjectLogic extends BaseLogic
         if($domainInfo !== false){
         if($domainInfo !== false){
             $this->fail('当前域名已被其他服务器使用');
             $this->fail('当前域名已被其他服务器使用');
         }
         }
-        //先清空上一次所绑定的域名
-        $info = $domainModel->read(['project_id'=>$project_id]);
-        if($info !== false){
-            $domainModel->edit(['project_id'=>0,'status'=>DomainInfo::STATUS_ZERO],['id'=>$info['id']]);
-        }
+        $domainModel->edit(['project_id'=>0,'status'=>DomainInfo::STATUS_ZERO],['project_id'=>$project_id]);
         //重新设置域名
         //重新设置域名
         $domainModel->edit(['status'=>DomainInfo::STATUS_ONE,'project_id'=>$project_id],['id'=>$domain]);
         $domainModel->edit(['status'=>DomainInfo::STATUS_ONE,'project_id'=>$project_id],['id'=>$domain]);
         return $this->success();
         return $this->success();