From 4856ab3b5e2a798e450cc040c65d311acbc7f456 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Tue, 9 Dec 2025 09:09:18 +0800
Subject: [PATCH] =?UTF-8?q?s=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E8=84=B1=E6=95=8F=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../info/command/query/UserQueryExe.java      | 27 +++++--------------
 .../info/dto/clientobject/CorpInfoCO.java     |  6 ++---
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java
index d0ca4fc..5afe7f2 100644
--- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java
@@ -56,9 +56,7 @@ public class UserQueryExe {
         userE.dataProcessingRights(AuthContext.getTenantId(), params);
         PageResponse<UserDO> pageResponse = userRepository.listPage(params);
         List<UserCO> examCenterCOS = userCoConvertor.converDOsToCOs(pageResponse.getData());
-        if(CollUtil.isNotEmpty(examCenterCOS)){
-            examCenterCOS.forEach(this::desensitize);
-        }
+
         return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
     }
 
@@ -74,11 +72,7 @@ public class UserQueryExe {
         Map<String, Object> params = PageQueryHelper.toHashMap(userQryCmd);
         List<UserDO> imgFilesDOList = userRepository.listAll(params);
         List<UserCO> imgFilesCOList = userCoConvertor.converDOsToCOs(imgFilesDOList);
-        //手机号脱敏
-        //身份照脱敏
-        if(CollUtil.isNotEmpty(imgFilesCOList)){
-            imgFilesCOList.forEach(this::desensitize);
-        }
+
         return MultiResponse.of(imgFilesCOList);
     }
 
@@ -93,7 +87,6 @@ public class UserQueryExe {
         UserDO userDO = userRepository.getInfoById(id);
         UserCO userCO = new UserCO();
         BeanUtils.copyProperties(userDO, userCO);
-        desensitize(userCO);
         //如果是相关方流动人员，查找岗位部门
         UserCorpDO userCorpDO = userCorpRepository.getInfoByUserId(userCO.getId(),AuthContext.getTenantId());
         if(userCorpDO != null){
@@ -140,26 +133,23 @@ public class UserQueryExe {
         userDOQueryWrapper.in("id",collection);
         List<UserDO> list = userRepository.list(userDOQueryWrapper);
         List<UserCO> userCOS = userCoConvertor.converDOsToCOs(list);
-        userCOS.forEach(this::desensitize);
         return userCOS;
     }
 
     public List<UserCO> getUserList() {
         List<UserDO> list = userRepository.list();
         List<UserCO> userCOS = userCoConvertor.converDOsToCOs(list);
-        userCOS.forEach(this::desensitize);
         return userCOS;
     }
 
-    private void desensitize(UserCO userCO) {
-        userCO.setUserIdCard(DesensitizationUtils.idCardDesensitize(userCO.getUserIdCard()));
-        userCO.setPhone(DesensitizationUtils.mobileDesensitize(userCO.getPhone()));
-    }
+//    private void desensitize(UserCO userCO) {
+//        userCO.setUserIdCard(DesensitizationUtils.idCardDesensitize(userCO.getUserIdCard()));
+//        userCO.setPhone(DesensitizationUtils.mobileDesensitize(userCO.getPhone()));
+//    }
 
     public UserCO getInfoByUserId(Long aLong) {
         UserDO byId = userRepository.getById(aLong);
         UserCO userCO = userCoConvertor.converDOToCO(byId);
-        desensitize(userCO);
         return userCO;
     }
 
@@ -192,7 +182,6 @@ public class UserQueryExe {
         UserDO userDO = userRepository.getInfoById(id);
         UserCO userCO = new UserCO();
         BeanUtils.copyProperties(userDO, userCO);
-        desensitize(userCO);
         return SingleResponse.of(userCO);
     }
 
@@ -210,9 +199,7 @@ public class UserQueryExe {
         userE.dataProcessingRights(AuthContext.getTenantId(), params);
         PageResponse<UserDO> pageResponse = userRepository.listXgf(params);
         List<UserXmfCO> userXmfCOList = userCoConvertor.converDOsToXgfCOs(pageResponse.getData());
-//        if(CollUtil.isNotEmpty(userXmfCOList)){
-//            userXmfCOList.forEach(this::desensitize);
-//        }
+
         return PageResponse.of(userXmfCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
     }
 }
diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java
index 3996482..a27c6bf 100644
--- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java
@@ -91,14 +91,14 @@ public class CorpInfoCO extends ClientObject {
     private String contacts;
     //主要负责人手机号
     @ApiModelProperty(value = "主要负责人手机号")
-    @MobilePhoneMask
+//    @MobilePhoneMask
     private String contactsPhone;
     //安全负责人
     @ApiModelProperty(value = "安全负责人")
     private String safetyName;
     //安全负责人手机号
     @ApiModelProperty(value = "安全负责人手机号")
-    @MobilePhoneMask
+//    @MobilePhoneMask
     private String safetyPhone;
     //是否规模以上,1:是,0:否
     @ApiModelProperty(value = "是否规模以上,1:是,0:否")
@@ -125,7 +125,7 @@ public class CorpInfoCO extends ClientObject {
     private String lrName;
     //法人手机号
     @ApiModelProperty(value = "法人手机号")
-    @MobilePhoneMask
+//    @MobilePhoneMask
     private String lrMobile;
     //行业分类
     @ApiModelProperty(value = "行业分类")