gx

@@ -138,25 +138,50 @@ class ProjectController extends BaseController
     public function searchParam(&$query){
         //参数type
         $query = $this->searchType($query);
+        //根据查看权限搜索
         $query = $this->getManagerRole($query);
-//        //搜索名称
-//        if(isset($this->map['title'])){
-//            $query = $query->orwhere('gl_project.title','like','%'.$this->map['title'].'%');
-//        }
-//        //搜索技术组
-//        if(!empty($this->map['dept_id'])){
-//            $query = $query->orwhere('gl_project_deploy_build.dept_id',$this->map['dept_id'])
-//                ->orwhere('gl_project_deploy_optimize.dept_id',$this->map['dept_id']);
-//        }
-//        //搜索技术人员
-//        $query = $this->searchManager($query);
-//        //按类型搜索
-//        if(!empty($param['search']) && !empty($param['search_type'])){
-//            //搜索域名
-//            $query = $query->orwhere('gl_project_deploy_optimize.domain','like','%'.$this->map['search'].'%')
-//                ->orwhere('gl_project.company','like','%'.$this->map['search'].'%')
-//                ->orwhere('gl_project.title','like','%'.$this->map['search'].'%');
-//        }
+        //搜索技术组
+        $query = $this->searchDept($query);
+        //搜索技术人员
+        $query = $this->searchManager($query);
+        //按类型搜索
+        $query = $this->searchDomainTitle($query);
+        return $query;
+    }
+
+    /**
+     * @remark :按需搜索
+     * @name   :searchDomainTitle
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/7 18:39
+     */
+    public function searchDomainTitle(&$query){
+        if(!empty($param['search']) && !empty($param['search_type'])){
+            //搜索域名
+            $query->where(function ($subQuery) {
+                $subQuery->orwhere('gl_project_deploy_optimize.domain','like','%'.$this->map['search'].'%')
+                         ->orwhere('gl_project.company','like','%'.$this->map['search'].'%')
+                         ->orwhere('gl_project.title','like','%'.$this->map['search'].'%');
+            });
+        }
+        return $query;
+    }
+
+    /**
+     * @remark :搜索技术组
+     * @name   :searchDept
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/7 18:40
+     */
+    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']);
+            });
+        }
         return $query;
     }
 
@@ -199,20 +224,22 @@ class ProjectController extends BaseController
      * @method :post
      * @time   :2023/9/7 17:16
      */
-    public function searchManager(&$query){
-        if(!empty($this->map['manage_id'])){
-            $query = $query
-                ->orwhere('gl_project_deploy_build.leader_mid',$this->map['manage_id'])
-                ->orwhere('gl_project_deploy_build.manager_mid',$this->map['manage_id'])
-                ->orwhere('gl_project_deploy_build.designer_mid',$this->map['manage_id'])
-                ->orwhere('gl_project_deploy_build.tech_mid',$this->map['manage_id'])
-                ->orwhere('gl_project_deploy_optimize.manager_mid',$this->map['manage_id'])
-                ->orwhere('gl_project_deploy_optimize.optimist_mid',$this->map['manage_id'])
-                ->orwhere('gl_project_deploy_optimize.assist_mid',$this->map['manage_id'])
-                ->orwhere('gl_project_deploy_optimize.tech_mid',$this->map['manage_id'])
-                ->orwhere('gl_project_deploy_optimize.tech_leader',$this->map['manage_id'])
-                ->orwhere('gl_project_deploy_optimize.quality_mid',$this->map['manage_id'])
-                ->orwhere('gl_project_deploy_optimize.design_mid',$this->map['manage_id']);
+    public function searchManager(&$query)
+    {
+        if (!empty($this->map['manage_id'])) {
+            $query->where(function ($subQuery) {
+                $subQuery->orWhere('gl_project_deploy_build.leader_mid', $this->map['manage_id'])
+                    ->orWhere('gl_project_deploy_build.manager_mid', $this->map['manage_id'])
+                    ->orWhere('gl_project_deploy_build.designer_mid', $this->map['manage_id'])
+                    ->orWhere('gl_project_deploy_build.tech_mid', $this->map['manage_id'])
+                    ->orWhere('gl_project_deploy_optimize.manager_mid', $this->map['manage_id'])
+                    ->orWhere('gl_project_deploy_optimize.optimist_mid', $this->map['manage_id'])
+                    ->orWhere('gl_project_deploy_optimize.assist_mid', $this->map['manage_id'])
+                    ->orWhere('gl_project_deploy_optimize.tech_mid', $this->map['manage_id'])
+                    ->orWhere('gl_project_deploy_optimize.tech_leader', $this->map['manage_id'])
+                    ->orWhere('gl_project_deploy_optimize.quality_mid', $this->map['manage_id'])
+                    ->orWhere('gl_project_deploy_optimize.design_mid', $this->map['manage_id']);
+            });
         }
         return $query;
     }