|
@@ -57,10 +57,7 @@ import vip.xiaonuo.sys.modular.user.enums.SysUserStatusEnum;
|
|
|
import vip.xiaonuo.sys.modular.user.service.SysUserService;
|
|
|
import vip.xiaonuo.sys.modular.user.service.impl.SysUserServiceImpl;
|
|
|
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.Set;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -85,6 +82,14 @@ public class AlarmUserServiceImpl extends ServiceImpl<AlarmUserMapper, AlarmUser
|
|
|
SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
|
|
|
QueryWrapper<AlarmUser> queryWrapper = new QueryWrapper<AlarmUser>().checkSqlInjection();
|
|
|
queryWrapper.lambda().like(StrUtil.isNotBlank(alarmUserPageParam.getNickName()), AlarmUser::getNickName, alarmUserPageParam.getNickName());
|
|
|
+ if (ObjectUtil.isNotEmpty(alarmUserPageParam.getName())) {
|
|
|
+ Page<SysUser> userPageByName = sysUserService.getUserByName(alarmUserPageParam.getName());
|
|
|
+ if (userPageByName.getTotal() < 1) {
|
|
|
+ return Page.of(userPageByName.getCurrent(), userPageByName.getSize());
|
|
|
+ }
|
|
|
+ List<String> userIds = userPageByName.getRecords().stream().map(SysUser::getId).toList();
|
|
|
+ queryWrapper.lambda().in(AlarmUser::getUserId, userIds);
|
|
|
+ }
|
|
|
if (ObjectUtil.isAllNotEmpty(alarmUserPageParam.getSortField(), alarmUserPageParam.getSortOrder())) {
|
|
|
CommonSortOrderEnum.validate(alarmUserPageParam.getSortOrder());
|
|
|
queryWrapper.orderBy(true, alarmUserPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
|