From 25caaac80016e539c99e7c909ab961cfd679e9ce Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Thu, 13 Aug 2026 11:49:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF=EF=BC=8C=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E7=AB=AF-=E6=89=A7=E6=B3=95=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EnforcementRegistrationServiceImpl.java | 13 +++++++------ .../system/service/impl/SysUserServiceImpl.java | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java index fbbe8810..353da5c0 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java @@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zdxt.enforcementcode.common.annotation.DataScope; import com.zdxt.enforcementcode.common.commonenum.PlatformTypeEnums; +import com.zdxt.enforcementcode.common.util.CommonUtil; import com.zdxt.enforcementcode.common.util.IdCardCryptoUtil; import com.zdxt.enforcementcode.domain.*; import com.zdxt.enforcementcode.domain.bo.DashboardEnterpriseCheckQueryBo; @@ -269,7 +270,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat try { SysUser user = userMap.get(Convert.toLong(vo.getLawEnforcerId())); if (user != null) { - vo.setLawEnforcerDisplay(formatEnforcerDisplay(user)); + vo.setLawEnforcer(formatEnforcerDisplay(user)); } } catch (Exception ignored) {} } @@ -302,10 +303,10 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat } // 无执法证号时展示脱敏手机号 String phone = user.getPhonenumber(); - if (StringUtils.isNotBlank(phone) && phone.length() >= 7) { + /*if (StringUtils.isNotBlank(phone) && phone.length() >= 7) { phone = phone.substring(0, 3) + "****" + phone.substring(phone.length() - 4); - } - return user.getUserName() + " " + (phone != null ? phone : ""); + }*/ + return user.getUserName() + " " + CommonUtil.encryptPhone(phone); } /** @@ -501,7 +502,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat try { SysUser user = userMap.get(Convert.toLong(vo.getLawEnforcerId())); if (user != null) { - vo.setLawEnforcerDisplay(formatEnforcerDisplay(user)); + vo.setLawEnforcer(formatEnforcerDisplay(user)); } } catch (Exception ignored) {} } @@ -589,7 +590,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat try { SysUser user = userMap.get(Convert.toLong(registrationVo.getLawEnforcerId())); if (user != null) { - infoVo.setLawEnforcerDisplay(formatEnforcerDisplay(user)); + infoVo.setLawEnforcer(formatEnforcerDisplay(user)); } } catch (Exception ignored) {} } diff --git a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index e34f83c9..c61069d4 100644 --- a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -205,7 +205,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Override public List selectUserByIds(List userIds, Long deptId) { return baseMapper.selectUserList(new LambdaQueryWrapper() - .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName) + .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName,SysUser::getLawCertificateNum,SysUser::getPhonenumber) .eq(SysUser::getStatus, SystemConstants.NORMAL) .eq(ObjectUtil.isNotNull(deptId), SysUser::getDeptId, deptId) .in(CollUtil.isNotEmpty(userIds), SysUser::getUserId, userIds));