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

@@ -567,7 +567,9 @@ class ProjectController extends BaseController
      */
      */
     public function getManagerList(){
     public function getManagerList(){
         $hrManagerModel = new ManageHr();
         $hrManagerModel = new ManageHr();
+        if(!isset($this->param['name']) || empty($this->param['name'])){
             $this->map['status'] = $hrManagerModel::STATUS_ONE;
             $this->map['status'] = $hrManagerModel::STATUS_ONE;
+        }
         if(isset($this->map['entry_position']) && !empty($this->map['entry_position'])){
         if(isset($this->map['entry_position']) && !empty($this->map['entry_position'])){
             $this->map['entry_position'] = ['in',$this->map['entry_position']];
             $this->map['entry_position'] = ['in',$this->map['entry_position']];
         }
         }
@@ -968,5 +970,33 @@ class ProjectController extends BaseController
         $this->response('success');
         $this->response('success');
     }
     }
 
 
+    /**
+     * @remark :更新项目的管理员
+     * @name   :updateProjectManager
+     * @author :lyh
+     * @method :post
+     * @time   :2024/4/7 10:41
+     */
+    public function updateProjectManager(ProjectLogic $logic){
+        $this->request->validate([
+            'old_id'=>'required',
+            'new_id'=>'required'
+        ],[
+            'old_id.required' => '参数不能为空',
+            'new_id.required' => '参数不能为空',
+        ]);
+        //查看当前用户是否存在
+        $hrModel = new ManageHr();
+        $hrInfo = $hrModel->read(['id'=>$this->param['old_id']]);
+        if($hrInfo === false){
+            $this->response('当前用户不存在',Code::SYSTEM_ERROR);
+        }
+        $hrInfo = $hrModel->read(['id'=>$this->param['new_id'],'status'=>1]);
+        if($hrInfo === false){
+            $this->response('变更的用户不存在',Code::SYSTEM_ERROR);
+        }
+        $logic->getManagerFiled($hrInfo['entry_position'],$this->param['old_id'],$this->param['new_id']);
+        $this->response('success');
+    }
 
 
 }
 }

@@ -830,4 +830,64 @@ class ProjectLogic extends BaseLogic
         return $this->success();
         return $this->success();
     }
     }
 
 
+    /**
+     * @remark :根据管理员的人事角色获取对应更新字段
+     * @name   :getManagerFiled
+     * @author :lyh
+     * @method :post
+     * @time   :2024/4/7 11:12
+     */
+    public function getManagerFiled($entry_position,$old_id,$new_id){
+        switch ($entry_position){
+                //技术经理
+            case 41:
+                $deployBuildModel = new DeployBuild();
+                $deployBuildModel->edit(['leader_mid'=>$new_id],['leader_mid'=>$old_id]);
+                break;
+                //项目经理
+            case 39:
+                $deployBuildModel = new DeployBuild();
+                $deployBuildModel->edit(['manager_mid'=>$new_id],['manager_mid'=>$old_id]);
+                break;
+                //设计师
+            case 38:
+                $deployBuildModel = new DeployBuild();
+                $deployBuildModel->edit(['tech_mid'=>$new_id],['tech_mid'=>$old_id]);
+                //技术助理
+            case 40:
+                $deployBuildModel = new DeployBuild();
+                $deployBuildModel->edit(['tech_mid'=>$new_id],['tech_mid'=>$old_id]);
+                break;
+                //优化主管+优化经理
+            case 51:
+            case 48:
+                $deployOptimizeModel = new DeployOptimize();
+                $deployOptimizeModel->edit(['manager_mid'=>$new_id],['manager_mid'=>$old_id]);
+                $deployOptimizeModel->edit(['tech_leader'=>$new_id],['tech_leader'=>$old_id]);
+                break;
+                //优化师
+            case 44:
+                $deployOptimizeModel = new DeployOptimize();
+                $deployOptimizeModel->edit(['optimist_mid'=>$new_id],['optimist_mid'=>$old_id]);
+                $deployOptimizeModel->edit(['assist_mid'=>$new_id],['assist_mid'=>$old_id]);
+                break;
+            case 46:
+                //优化师助理
+                $deployOptimizeModel = new DeployOptimize();
+                $deployOptimizeModel->edit(['assist_mid'=>$new_id],['assist_mid'=>$old_id]);
+            case 45:
+                //售后技术
+                $deployOptimizeModel = new DeployOptimize();
+                $deployOptimizeModel->edit(['tech_mid'=>$new_id],['tech_mid'=>$old_id]);
+            case 38:
+                //品控
+                $deployOptimizeModel = new DeployOptimize();
+                $deployOptimizeModel->edit(['design_mid'=>$new_id],['design_mid'=>$old_id]);
+            default:
+                break;
+        }
+        return true;
+    }
+
+
 }
 }

@@ -187,6 +187,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/countryLists', [Aside\Project\ProjectController::class, 'countryLists'])->name('admin.project_countryLists');//国家地区列表
         Route::any('/countryLists', [Aside\Project\ProjectController::class, 'countryLists'])->name('admin.project_countryLists');//国家地区列表
         Route::any('/saveInquiryFilterConfig', [Aside\Project\ProjectController::class, 'saveInquiryFilterConfig'])->name('admin.project_inquiry_filter_config_save');//保存询盘过滤配置
         Route::any('/saveInquiryFilterConfig', [Aside\Project\ProjectController::class, 'saveInquiryFilterConfig'])->name('admin.project_inquiry_filter_config_save');//保存询盘过滤配置
         Route::any('/saveWebTrafficConfig', [Aside\Project\ProjectController::class, 'saveWebTrafficConfig'])->name('admin.project_web_traffic_config_save');//保存引流配置
         Route::any('/saveWebTrafficConfig', [Aside\Project\ProjectController::class, 'saveWebTrafficConfig'])->name('admin.project_web_traffic_config_save');//保存引流配置
+        Route::any('/updateProjectManager', [Aside\Project\ProjectController::class, 'updateProjectManager'])->name('admin.project_updateProjectManager');//更改项目人员配置
         //获取关键词前缀和后缀
         //获取关键词前缀和后缀
         Route::prefix('keyword')->group(function () {
         Route::prefix('keyword')->group(function () {
             Route::any('/getKeywordPrefix', [Aside\Project\KeywordPrefixController::class, 'getKeywordPrefix'])->name('admin.keyword_getKeywordPrefix');
             Route::any('/getKeywordPrefix', [Aside\Project\KeywordPrefixController::class, 'getKeywordPrefix'])->name('admin.keyword_getKeywordPrefix');