作者 lyh

gx

@@ -17,13 +17,12 @@ class DeptUserController extends BaseController @@ -17,13 +17,12 @@ class DeptUserController extends BaseController
17 */ 17 */
18 public function lists(){ 18 public function lists(){
19 $query = DB::table('gl_project_user') 19 $query = DB::table('gl_project_user')
20 - ->select($this->selectParam())  
21 ->leftJoin('gl_project_dept_user', 'gl_project_user.id', '=', 'gl_project_dept_user.user_id') 20 ->leftJoin('gl_project_dept_user', 'gl_project_user.id', '=', 'gl_project_dept_user.user_id')
22 ->leftJoin('gl_project_dept', 'gl_project_dept_user.dept_id', '=', 'gl_project_dept.id') 21 ->leftJoin('gl_project_dept', 'gl_project_dept_user.dept_id', '=', 'gl_project_dept.id')
23 ->join('gl_project_role', 'gl_project_user.role_id', '=', 'gl_project_role.id') 22 ->join('gl_project_role', 'gl_project_user.role_id', '=', 'gl_project_role.id')
24 ->orderBy('gl_project_dept_user.id','desc'); 23 ->orderBy('gl_project_dept_user.id','desc');
25 $query = $this->searchParam($query); 24 $query = $this->searchParam($query);
26 - $lists = $query->paginate($this->row, ['*'], 'page', $this->page); 25 + $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page);
27 $this->response('success',Code::SUCCESS,$lists); 26 $this->response('success',Code::SUCCESS,$lists);
28 } 27 }
29 28
@@ -82,7 +81,7 @@ class DeptUserController extends BaseController @@ -82,7 +81,7 @@ class DeptUserController extends BaseController
82 ],[ 81 ],[
83 'id.required' => 'id不能为空' 82 'id.required' => 'id不能为空'
84 ]); 83 ]);
85 - $info = $deptUserLogic->dept_user_info($this->param); 84 + $info = $deptUserLogic->dept_user_info();
86 $this->response('success',Code::SUCCESS,$info); 85 $this->response('success',Code::SUCCESS,$info);
87 } 86 }
88 87