|
...
|
...
|
@@ -18,7 +18,7 @@ class DeptUserController extends BaseController |
|
|
|
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')->where($this->map)
|
|
|
|
$result = DB::table('gl_project_user')
|
|
|
|
->select(
|
|
|
|
'gl_project_dept_user.dept_id AS dept_id',
|
|
|
|
'gl_project_user.name AS name',
|
|
...
|
...
|
@@ -36,6 +36,7 @@ class DeptUserController extends BaseController |
|
|
|
'gl_project_dept_user.id AS id',
|
|
|
|
'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', 'gl_project_dept_user.dept_id', '=', 'gl_project_dept.id')
|
|
|
|
->join('gl_project_role', 'gl_project_user.role_id', '=', 'gl_project_role.id')
|
...
|
...
|
|
