|
...
|
...
|
@@ -38,9 +38,13 @@ class DeptUserController extends BaseController |
|
|
|
->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')
|
|
|
|
->orderBy('gl_project_dept_user.id','desc');
|
|
|
|
//搜索条件处理
|
|
|
|
if(isset($this->map['name'])){
|
|
|
|
$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']);
|
|
|
|
}
|
|
|
|
$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);
|
...
|
...
|
|