This commit is contained in:
mashuai 2025-06-18 10:46:46 +08:00
parent 841b3773a9
commit fcc42c6de3
1 changed files with 10 additions and 3 deletions

View File

@ -639,13 +639,15 @@ public class SysUserServiceImpl implements ISysUserService {
//临时获取开始时间和结束时间 //临时获取开始时间和结束时间
String beginTime = (String) user.getParams().get("beginTime"); String beginTime = (String) user.getParams().get("beginTime");
String endTime = (String) user.getParams().get("endTime"); String endTime = (String) user.getParams().get("endTime");
BaseEntity entity = CommonDataPermissionInfo.backMissionInfo(user.getParams().get("dataScope").toString()); Object dataScope = user.getParams().get("dataScope");
BeanUtils.copyProperties(entity, user); if (dataScope != null) {
BaseEntity entity = CommonDataPermissionInfo.backMissionInfo(dataScope.toString());
BeanUtils.copyProperties(entity, user);
}
user.getParams().put("beginTime", beginTime); user.getParams().put("beginTime", beginTime);
user.getParams().put("endTime", endTime); user.getParams().put("endTime", endTime);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
user.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); user.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
List<SysUser> sysUsers = userMapper.getList(user); List<SysUser> sysUsers = userMapper.getList(user);
@ -653,6 +655,11 @@ public class SysUserServiceImpl implements ISysUserService {
if (StringUtils.isNotBlank(user.getPhonenumber())) { if (StringUtils.isNotBlank(user.getPhonenumber())) {
sysUsers = sysUsers.stream().filter(sysUser -> sysUser.getPhonenumber().contains(Sm4Utils.decrypt(user.getPhonenumber()))).collect(Collectors.toList()); sysUsers = sysUsers.stream().filter(sysUser -> sysUser.getPhonenumber().contains(Sm4Utils.decrypt(user.getPhonenumber()))).collect(Collectors.toList());
} }
for (SysUser sysUser : sysUsers) {
if (StringUtils.isNotBlank(sysUser.getPhonenumber()) && sysUser.getPhonenumber().length() > 11) {
sysUser.setPhonenumber(Sm4Utils.decrypt(sysUser.getPhonenumber()));
}
}
} }
return sysUsers; return sysUsers;
} }