|
@@ -56,7 +56,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public HttpRespMsg pageList(PageUtil page, String account, String keyName) {
|
|
|
|
|
|
+ public HttpRespMsg pageList(PageUtil page, String account, String keyName,User user) {
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
QueryWrapper<User> qw = new QueryWrapper<>();
|
|
QueryWrapper<User> qw = new QueryWrapper<>();
|
|
if(keyName !=null && !"".equals(keyName)){
|
|
if(keyName !=null && !"".equals(keyName)){
|
|
@@ -64,6 +64,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
}else if(account !=null && !"".equals(account)){
|
|
}else if(account !=null && !"".equals(account)){
|
|
qw.eq("account", account);
|
|
qw.eq("account", account);
|
|
}
|
|
}
|
|
|
|
+ qw.eq("parent_id",user.getParentId());
|
|
PageHelper.startPage(page.getPageNum(),page.getPageSize());
|
|
PageHelper.startPage(page.getPageNum(),page.getPageSize());
|
|
List<User> users = userMapper.selectList(qw);
|
|
List<User> users = userMapper.selectList(qw);
|
|
PageInfo<User> pageInfos = new PageInfo<>(users);
|
|
PageInfo<User> pageInfos = new PageInfo<>(users);
|