正在显示
1 个修改的文件
包含
20 行增加
和
10 行删除
| @@ -17,7 +17,24 @@ class DeptUserController extends BaseController | @@ -17,7 +17,24 @@ 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( | 20 | + ->select($this->selectParam()) |
| 21 | + ->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') | ||
| 23 | + ->join('gl_project_role', 'gl_project_user.role_id', '=', 'gl_project_role.id') | ||
| 24 | + ->orderBy('gl_project_dept_user.id','desc'); | ||
| 25 | + $query = $this->searchParam($query); | ||
| 26 | + $lists = $query->paginate($this->row, ['*'], 'page', $this->page); | ||
| 27 | + $this->response('success',Code::SUCCESS,$lists); | ||
| 28 | + } | ||
| 29 | + | ||
| 30 | + /** | ||
| 31 | + * @name :(查询参数设置)selectParam | ||
| 32 | + * @author :lyh | ||
| 33 | + * @method :post | ||
| 34 | + * @time :2023/6/14 15:00 | ||
| 35 | + */ | ||
| 36 | + public function selectParam(){ | ||
| 37 | + $select = [ | ||
| 21 | 'gl_project_dept_user.dept_id AS dept_id', | 38 | 'gl_project_dept_user.dept_id AS dept_id', |
| 22 | 'gl_project_user.name AS name', | 39 | 'gl_project_user.name AS name', |
| 23 | 'gl_project_user.project_id AS project_id', | 40 | 'gl_project_user.project_id AS project_id', |
| @@ -33,16 +50,9 @@ class DeptUserController extends BaseController | @@ -33,16 +50,9 @@ class DeptUserController extends BaseController | ||
| 33 | 'gl_project_user.id AS user_id', | 50 | 'gl_project_user.id AS user_id', |
| 34 | 'gl_project_dept_user.id AS id', | 51 | 'gl_project_dept_user.id AS id', |
| 35 | 'gl_project_role.name AS role_name' | 52 | 'gl_project_role.name AS role_name' |
| 36 | - ) | ||
| 37 | - ->leftJoin('gl_project_dept_user', 'gl_project_user.id', '=', 'gl_project_dept_user.user_id') | ||
| 38 | - ->leftJoin('gl_project_dept', 'gl_project_dept_user.dept_id', '=', 'gl_project_dept.id') | ||
| 39 | - ->join('gl_project_role', 'gl_project_user.role_id', '=', 'gl_project_role.id') | ||
| 40 | - ->orderBy('gl_project_dept_user.id','desc'); | ||
| 41 | - $query = $this->searchParam($query); | ||
| 42 | - $lists = $query->paginate($this->row, ['*'], 'page', $this->page); | ||
| 43 | - $this->response('success',Code::SUCCESS,$lists); | 53 | + ]; |
| 54 | + return $select; | ||
| 44 | } | 55 | } |
| 45 | - | ||
| 46 | /** | 56 | /** |
| 47 | * @name :(搜索参数处理)searchParam | 57 | * @name :(搜索参数处理)searchParam |
| 48 | * @author :lyh | 58 | * @author :lyh |
-
请 注册 或 登录 后发表评论