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

gx项目中台搜索功能



查看合并请求 !1027

@@ -258,10 +258,14 @@ class ProjectController extends BaseController
      */
     public function searchDept(&$query){
         if(!empty($this->map['dept_id'])){
-            $query->where(function ($subQuery) {
-                $subQuery->orwhere('gl_project_deploy_build.dept_id',$this->map['dept_id'])
-                    ->orwhere('gl_project_deploy_optimize.dept_id',$this->map['dept_id']);
-            });
+            if($this->map['dept_id'] == 7 || $this->map['dept_id'] == 9){//7,9代表合并组H+F组
+                $query->whereIn('gl_project_deploy_build.dept_id', [7,9]);
+            }else{
+                $query->where(function ($subQuery) {
+                    $subQuery->orwhere('gl_project_deploy_build.dept_id',$this->map['dept_id'])
+                        ->orwhere('gl_project_deploy_optimize.dept_id',$this->map['dept_id']);
+                });
+            }
         }
         return $query;
     }
@@ -322,8 +326,12 @@ class ProjectController extends BaseController
                     ->orWhere('gl_project_deploy_optimize.tech_leader', $info['id'])
                     ->orWhere('gl_project_deploy_optimize.quality_mid', $info['id'])
                     ->orWhere('gl_project_deploy_optimize.design_mid', $info['id'])
-                    ->orWhere('gl_project_deploy_build.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']);
+                    }
             });
         }
         return $query;