|
|
@@ -53,7 +53,14 @@ public class UserController extends BaseController {
|
|
53
|
53
|
public AjaxResult getList(User input, PageInput pageInput) {
|
|
54
|
54
|
LambdaQueryWrapper<User> qw = new LambdaQueryWrapper();
|
|
55
|
55
|
qw.eq(input.getUserId() != null && input.getUserId() > 0, User::getUserId, input.getUserId());
|
|
56
|
|
- qw.eq(input.getDeptId() != null && input.getDeptId() > 0, User::getDeptId, input.getDeptId());
|
|
|
56
|
+ // qw.eq(input.getDeptId() != null && input.getDeptId() > 0, User::getDeptId, input.getDeptId());
|
|
|
57
|
+ if (input.getDeptId() != null &&input.getDeptId()>0)
|
|
|
58
|
+ {
|
|
|
59
|
+ //查询下级部门所有人员
|
|
|
60
|
+ qw.inSql(User::getDeptId, "select dept_id from sys_dept where " +
|
|
|
61
|
+ " ancestors REGEXP CONCAT((select ancestors from sys_dept where dept_id="+input.getDeptId()+"),',',"
|
|
|
62
|
+ +input.getDeptId()+") ") ;
|
|
|
63
|
+ }
|
|
57
|
64
|
qw.like(!StringHelper.isEmpty(input.getUserName()), User::getUserName, input.getUserName());
|
|
58
|
65
|
qw.like(!StringHelper.isEmpty(input.getNickName()), User::getNickName, input.getNickName());
|
|
59
|
66
|
qw.eq(!StringHelper.isEmpty(input.getUserType()), User::getUserType, input.getUserType());
|