作者 lyh

gx

@@ -38,9 +38,13 @@ class DeptUserController extends BaseController @@ -38,9 +38,13 @@ class DeptUserController extends BaseController
38 ->leftJoin('gl_project_dept', 'gl_project_dept_user.dept_id', '=', 'gl_project_dept.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') 39 ->join('gl_project_role', 'gl_project_user.role_id', '=', 'gl_project_role.id')
40 ->orderBy('gl_project_dept_user.id','desc'); 40 ->orderBy('gl_project_dept_user.id','desc');
  41 + //搜索条件处理
41 if(isset($this->map['name'])){ 42 if(isset($this->map['name'])){
42 $query = $query->where('gl_project_user.name',$this->map['name'][0],'%'.$this->map['name'][1].'%'); 43 $query = $query->where('gl_project_user.name',$this->map['name'][0],'%'.$this->map['name'][1].'%');
43 } 44 }
  45 + if(isset($this->map['id'])){
  46 + $query = $query->where('gl_project_dept_user',$this->map['id']);
  47 + }
44 $query = $query->where('gl_project_user.project_id',$this->user['project_id']); 48 $query = $query->where('gl_project_user.project_id',$this->user['project_id']);
45 $lists = $query->paginate($this->row, ['*'], 'page', $this->page); 49 $lists = $query->paginate($this->row, ['*'], 'page', $this->page);
46 $this->response('success',Code::SUCCESS,$lists); 50 $this->response('success',Code::SUCCESS,$lists);