From fcc42c6de3b165d5c421318bfb179fdba8926fd9 Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 18 Jun 2025 10:46:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/SysUserServiceImpl.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java index 3de892f..d9bc633 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java @@ -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 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; }