gx

@@ -15,10 +15,8 @@ class DeptUserController extends BaseController
      * @author :liyuhang
      * @author :liyuhang
      * @method
      * @method
      */
      */
-    public function lists(ViewDeptUser $viewDeptUser){
-        $this->map['project_id'] = $this->user['project_id'];
-//        $lists = $viewDeptUser->lists($this->map,$this->page,$this->row,'user_id');
-        $result = DB::table('gl_project_user')
+    public function lists(){
+        $query = DB::table('gl_project_user')
             ->select(
             ->select(
                 'gl_project_dept_user.dept_id AS dept_id',
                 'gl_project_dept_user.dept_id AS dept_id',
                 'gl_project_user.name AS name',
                 'gl_project_user.name AS name',
@@ -36,13 +34,16 @@ class DeptUserController extends BaseController
                 'gl_project_dept_user.id AS id',
                 'gl_project_dept_user.id AS id',
                 'gl_project_role.name AS role_name'
                 'gl_project_role.name AS role_name'
             )
             )
-            ->where($this->map)
             ->leftJoin('gl_project_dept_user', 'gl_project_user.id', '=', 'gl_project_dept_user.user_id')
             ->leftJoin('gl_project_dept_user', 'gl_project_user.id', '=', 'gl_project_dept_user.user_id')
             ->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('id','desc')
-            ->paginate($this->row, ['*'], 'page', $this->page);
-        $this->response('success',Code::SUCCESS,$result);
+            ->orderBy('gl_project_dept_user.id','desc');
+        if(isset($this->map['name'])){
+            $query = $query->where('gl_project_user.name','like','%'.$this->map['name'].'%');
+        }
+        $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);
     }
     }
 
 
     /**
     /**