This commit is contained in:
parent
841b3773a9
commit
fcc42c6de3
|
|
@ -639,13 +639,15 @@ public class SysUserServiceImpl implements ISysUserService {
|
|||
//临时获取开始时间和结束时间
|
||||
String beginTime = (String) user.getParams().get("beginTime");
|
||||
String endTime = (String) user.getParams().get("endTime");
|
||||
BaseEntity entity = CommonDataPermissionInfo.backMissionInfo(user.getParams().get("dataScope").toString());
|
||||
BeanUtils.copyProperties(entity, user);
|
||||
Object dataScope = user.getParams().get("dataScope");
|
||||
if (dataScope != null) {
|
||||
BaseEntity entity = CommonDataPermissionInfo.backMissionInfo(dataScope.toString());
|
||||
BeanUtils.copyProperties(entity, user);
|
||||
}
|
||||
user.getParams().put("beginTime", beginTime);
|
||||
user.getParams().put("endTime", endTime);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
|
||||
}
|
||||
user.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
|
||||
List<SysUser> sysUsers = userMapper.getList(user);
|
||||
|
|
@ -653,6 +655,11 @@ public class SysUserServiceImpl implements ISysUserService {
|
|||
if (StringUtils.isNotBlank(user.getPhonenumber())) {
|
||||
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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue