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

修复搜索项目bug



查看合并请求 !1028

@@ -314,7 +314,7 @@ class ProjectController extends BaseController
             $info = $managerHr->read(['manage_id'=>$this->manage['id']]);
             $info = $managerHr->read(['manage_id'=>$this->manage['id']]);
             //获取当前用户自己的项目
             //获取当前用户自己的项目
             $query->where(function ($subQuery) use ($info) {
             $query->where(function ($subQuery) use ($info) {
-                $subQuery->whereIn('gl_project.id',[1])//项目1+项目3默认显示
+                $subQuery->whereIn('gl_project.id', [1]) // 项目1 + 项目3默认显示
                 ->orWhere('gl_project_deploy_build.leader_mid', $info['id'])
                 ->orWhere('gl_project_deploy_build.leader_mid', $info['id'])
                     ->orWhere('gl_project_deploy_build.manager_mid', $info['id'])
                     ->orWhere('gl_project_deploy_build.manager_mid', $info['id'])
                     ->orWhere('gl_project_deploy_build.designer_mid', $info['id'])
                     ->orWhere('gl_project_deploy_build.designer_mid', $info['id'])
@@ -325,12 +325,17 @@ class ProjectController extends BaseController
                     ->orWhere('gl_project_deploy_optimize.tech_mid', $info['id'])
                     ->orWhere('gl_project_deploy_optimize.tech_mid', $info['id'])
                     ->orWhere('gl_project_deploy_optimize.tech_leader', $info['id'])
                     ->orWhere('gl_project_deploy_optimize.tech_leader', $info['id'])
                     ->orWhere('gl_project_deploy_optimize.quality_mid', $info['id'])
                     ->orWhere('gl_project_deploy_optimize.quality_mid', $info['id'])
-                    ->orWhere('gl_project_deploy_optimize.design_mid', $info['id'])
+                    ->orWhere('gl_project_deploy_optimize.design_mid', $info['id']);
+                // 处理 dept_id 条件
+                if (in_array($this->map['dept_id'], [7, 9])) {
+                    // 7, 9 代表合并组 H + F 组
+                    $subQuery->orWhere(function ($innerQuery) {
+                        $innerQuery->where('gl_project_deploy_build.dept_id', 7)
+                            ->orWhere('gl_project_deploy_build.dept_id', 9);
+                    });
+                } else {
+                    $subQuery->orWhere('gl_project_deploy_build.dept_id', $info['belong_group'])
                         ->orWhere('gl_project_deploy_optimize.dept_id', $info['belong_group']);
                         ->orWhere('gl_project_deploy_optimize.dept_id', $info['belong_group']);
-                    if($this->map['dept_id'] == 7 || $this->map['dept_id'] == 9){//7,9代表合并组H+F组
-                        $subQuery->orWhere('gl_project_deploy_build.dept_id', 7)->orWhere('gl_project_deploy_build.dept_id', 9);
-                    }else{
-                        $subQuery->orWhere('gl_project_deploy_build.dept_id', $info['belong_group'])->orWhere('gl_project_deploy_optimize.dept_id', $info['belong_group']);
                 }
                 }
             });
             });
         }
         }