执法端，企业端-执法人员查询返回结果修改

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) {}
             }

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<SysUserVo> selectUserByIds(List<Long> userIds, Long deptId) {
         return baseMapper.selectUserList(new LambdaQueryWrapper<SysUser>()
-            .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));