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

gx



查看合并请求 !1737

@@ -495,10 +495,6 @@ class ProjectLogic extends BaseLogic
         $onlineCheckModel = new OnlineCheck();
         $onlineCheckModel = new OnlineCheck();
         if(($plan == Project::TYPE_ZERO) && ($seo_plan == Project::TYPE_ONE) && ($type == Project::TYPE_TWO || $type == Project::TYPE_THREE)){
         if(($plan == Project::TYPE_ZERO) && ($seo_plan == Project::TYPE_ONE) && ($type == Project::TYPE_TWO || $type == Project::TYPE_THREE)){
             $onlineInfo = $onlineCheckModel->read(['project_id'=>$project_id]);
             $onlineInfo = $onlineCheckModel->read(['project_id'=>$project_id]);
-            if($onlineInfo === false){
-                if(empty($optimist_mid) || empty($quality_mid)){
-                    $this->fail('自动提交审核，请选择优化师及品控');
-                }
             $data = [
             $data = [
                 'project_id' => $project_id,
                 'project_id' => $project_id,
                 'created_manage_id' => $this->manager['id'],
                 'created_manage_id' => $this->manager['id'],
@@ -510,13 +506,19 @@ class ProjectLogic extends BaseLogic
                 'qa_status'=>1,
                 'qa_status'=>1,
                 'created_at'=>date('Y-m-d H:i:s'),
                 'created_at'=>date('Y-m-d H:i:s'),
             ];
             ];
+            if($onlineInfo === false){
+                if(empty($optimist_mid) || empty($quality_mid)){
+                    $this->fail('自动提交审核，请选择优化师及品控');
+                }
                 $onlineCheckModel->addReturnId($data);
                 $onlineCheckModel->addReturnId($data);
+            }else{
+                $onlineCheckModel->edit($data,['project_id'=>$project_id]);
+            }
             $this->param['status'] = Project::STATUS_ONE;
             $this->param['status'] = Project::STATUS_ONE;
             if(empty($this->param['uptime'])){
             if(empty($this->param['uptime'])){
                 $this->param['uptime'] = date('Y-m-d H:i:s');
                 $this->param['uptime'] = date('Y-m-d H:i:s');
             }
             }
         }
         }
-        }
         return true;
         return true;
     }
     }