gx

@@ -38,18 +38,28 @@ class DeptUserController extends BaseController
             ->leftJoin('gl_project_dept', 'gl_project_dept_user.dept_id', '=', 'gl_project_dept.id')
             ->leftJoin('gl_project_dept', 'gl_project_dept_user.dept_id', '=', 'gl_project_dept.id')
             ->join('gl_project_role', 'gl_project_user.role_id', '=', 'gl_project_role.id')
             ->join('gl_project_role', 'gl_project_user.role_id', '=', 'gl_project_role.id')
             ->orderBy('gl_project_dept_user.id','desc');
             ->orderBy('gl_project_dept_user.id','desc');
+        $query = $this->searchParam($query);
+        $lists = $query->paginate($this->row, ['*'], 'page', $this->page);
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+
+    /**
+     * @name   :(搜索参数处理)searchParam
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/14 14:58
+     */
+    public function searchParam(&$query){
         //搜索条件处理
         //搜索条件处理
         if(isset($this->map['name'])){
         if(isset($this->map['name'])){
             $query = $query->where('gl_project_user.name',$this->map['name'][0],'%'.$this->map['name'][1].'%');
             $query = $query->where('gl_project_user.name',$this->map['name'][0],'%'.$this->map['name'][1].'%');
         }
         }
-        if(isset($this->map['id'])){
-            $query = $query->where('gl_project_dept_user',$this->map['id']);
+        if(isset($this->map['dept_id'])){
+            $query = $query->where('gl_project_dept_user.dept_id',$this->map['dept_id']);
         }
         }
         $query = $query->where('gl_project_user.project_id',$this->user['project_id']);
         $query = $query->where('gl_project_user.project_id',$this->user['project_id']);
-        $lists = $query->paginate($this->row, ['*'], 'page', $this->page);
-        $this->response('success',Code::SUCCESS,$lists);
+        return $query;
     }
     }
-
     /**
     /**
      * @name   :（详情）info
      * @name   :（详情）info
      * @author :lyh
      * @author :lyh