|
|
@ -157,7 +157,8 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
|
|
|
|
Page<SystemUser> userInfoPage = super.page(Page.of(pageNum, pageSize),
|
|
|
|
Page<SystemUser> userInfoPage = super.page(Page.of(pageNum, pageSize),
|
|
|
|
new LambdaQueryWrapper<SystemUser>()
|
|
|
|
new LambdaQueryWrapper<SystemUser>()
|
|
|
|
.like(StrUtil.isNotEmpty(userName), SystemUser::getUserName, userName)
|
|
|
|
.like(StrUtil.isNotEmpty(userName), SystemUser::getUserName, userName)
|
|
|
|
.in(CollUtil.isNotEmpty(userRoleFilterList), SystemUser::getId, userRoleFilterList.stream().map(UserRoleDTO::getUserId).toList()));
|
|
|
|
.in(CollUtil.isNotEmpty(userRoleFilterList), SystemUser::getId, userRoleFilterList.stream().map(UserRoleDTO::getUserId).toList())
|
|
|
|
|
|
|
|
.orderBy(true,false, SystemUser::getUpdateTime));
|
|
|
|
|
|
|
|
|
|
|
|
if (CollUtil.isEmpty(userInfoPage.getRecords())){
|
|
|
|
if (CollUtil.isEmpty(userInfoPage.getRecords())){
|
|
|
|
return Page.of(pageNum, pageSize, userInfoPage.getTotal());
|
|
|
|
return Page.of(pageNum, pageSize, userInfoPage.getTotal());
|
|
|
|