|
@@ -63,6 +63,7 @@ import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.Set;
|
|
|
+import java.util.function.Function;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -129,10 +130,12 @@ public class AlarmUserServiceImpl extends ServiceImpl<AlarmUserMapper, AlarmUser
|
|
|
List<SysUser> sysUserList = sysUserService.list(new LambdaQueryWrapper<>(SysUser.class)
|
|
|
.in(SysUser::getId, userIdSet)
|
|
|
.eq(SysUser::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE));
|
|
|
- Map<String, String> userNameMap = sysUserList.stream().collect(Collectors.toMap(SysUser::getId, SysUser::getName));
|
|
|
+ Map<String, SysUser> userNameMap = sysUserList.stream().collect(Collectors.toMap(SysUser::getId, Function.identity()));
|
|
|
dtoList.forEach(dto -> {
|
|
|
- if (StrUtil.isNotBlank(dto.getUserId())) {
|
|
|
- dto.setName(userNameMap.get(dto.getUserId()));
|
|
|
+ if (StrUtil.isNotBlank(dto.getUserId()) && userNameMap.containsKey(dto.getUserId())) {
|
|
|
+ SysUser sysUser = userNameMap.get(dto.getUserId());
|
|
|
+ dto.setName(sysUser.getName());
|
|
|
+ dto.setPhone(sysUser.getPhone());
|
|
|
}
|
|
|
});
|
|
|
return dtoList;
|