gx

@@ -461,7 +461,7 @@ class ProjectController extends BaseController
             'status.required' => '请选择审核状态',
             'status.in' => '审核状态值无效',
         ]);
-        $logic->onlineCheck($this->param);
+        $logic->onlineCheck();
         $this->response('success');
     }
 

@@ -17,32 +17,43 @@ class OnlineCheckLogic extends BaseLogic
         $this->model = new OnlineCheck();
     }
 
-
-    public function onlineCheck($param){
-        $info = $this->model->where('project_id', $param['id'])->first();
-        if(!$info){
+    /**
+     * @remark :用户审核
+     * @name   :onlineCheck
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/22 11:01
+     */
+    public function onlineCheck(){
+        $info = $this->model->read(['project_id'=>$this->param['id']]);
+        if($info === false){
             $this->fail('项目未提交审核');
         }
         //查看当前用户是否有权限审核
-        if($param['type'] == 'optimist'){
+        if($this->param['type'] == 'optimist'){
             if($info['optimist_mid'] != $this->manager['id']){
                 $this->fail('你无权限提交审核');
             }
         }else{
+            //查看当前优化师是否审核
+            if($info['optimist_status'] != 1){
+                $this->fail('请先优化师审核');
+            }
             if($info['qa_mid'] != $this->manager['id']){
                 $this->fail('你无权限提交审核');
             }
+            if(isset($this->param['project_type']) && !empty($this->param['project_type'])){
+                $projectModel = new Project();
+                $projectModel->edit(['type'=>$this->param['project_type']],['id'=>$this->param['id']]);
+            }
         }
         $data = [
-            'project_id' => $param['id'],
-            $param['type'] . '_mid' => $this->manager['id'],
-            $param['type'] . '_check_time' => date('Y-m-d H:i:s'),
-            $param['type'] . '_status' => $param['status'],
+            $this->param['type'] . '_mid' => $this->manager['id'],
+            $this->param['type'] . '_check_time' => date('Y-m-d H:i:s'),
+            $this->param['type'] . '_status' => $this->param['status'],
             'remark' => $param['remark'] ??'',
         ];
-
-        $data['id'] = $info['id'];
-        return $this->save($data);
+        return $this->model->edit($data,['id'=>$info['id']]);
     }
 
     /**
@@ -56,7 +67,7 @@ class OnlineCheckLogic extends BaseLogic
         $info = $this->model->read(['project_id'=>$this->param['id']]);
         $projectModel = new Project();
         if($info !== false){
-            $this->model->edit($this->param,['id'=>$info['id']]);
+            $this->fail('已提交，请勿重复提交');
         }else{
             //组装数据
             $data = [

@@ -203,23 +203,15 @@ class ProjectLogic extends BaseLogic
         $deployOptimizeModel = new DeployOptimize();
         if(isset($deploy_optimize['domain']) && !empty($deploy_optimize['domain'])){
             //更改域名
-            if(isset($deploy_optimize['domain']) && !empty($deploy_optimize['domain'])){
-                $this->editDomainStatus($deploy_optimize['domain'],$deploy_optimize['project_id']);
-            }
-        }
-        if(isset($deploy_optimize['minor_languages']) && !empty($deploy_optimize['minor_languages'])){
-            $deploy_optimize['minor_languages'] = Arr::a2s($deploy_optimize['minor_languages']);
-        }
-        if(isset($deploy_optimize['minor_keywords']) && !empty($deploy_optimize['minor_keywords'])){
-            $deploy_optimize['minor_keywords'] = Arr::a2s($deploy_optimize['minor_keywords']);
+            $this->editDomainStatus($deploy_optimize['domain'],$deploy_optimize['project_id']);
         }
-
+        $deploy_optimize['minor_languages'] = Arr::a2s(!empty($deploy_optimize['minor_languages']) ?? []);
+        $deploy_optimize['minor_keywords'] = Arr::a2s(!empty($deploy_optimize['minor_keywords']) ?? []);
         //是否更新了api_no
         $api_no = DeployOptimize::where('id', $deploy_optimize['id'])->value('api_no');
         if($api_no != $deploy_optimize['api_no']){
             NoticeLog::createLog(NoticeLog::TYPE_RANK_DATA, ['api_no' => $deploy_optimize['api_no']]);
         }
-
         $deployOptimizeModel->edit($deploy_optimize,['id'=>$deploy_optimize['id']]);
         return $this->success();
     }