From dad7066209ba37b1d3694d22d04b1bb933118c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Mon, 13 Mar 2023 16:33:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=9B=B8=E5=85=B3=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-cloud-client-yushan                              |  2 +-
 epdc-cloud-commons-yushan                             |  2 +-
 .../service/impl/EpidemicUserInfoServiceImpl.java     | 11 +++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index f79cc57..df55714 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit f79cc57f17df4a5a287b0b3f1907d7d7fa871f63
+Subproject commit df557141415794417f4b09250c10d73b5d0c4d8c
diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan
index 640458a..fa05d3f 160000
--- a/epdc-cloud-commons-yushan
+++ b/epdc-cloud-commons-yushan
@@ -1 +1 @@
-Subproject commit 640458ab1be4f3e24a7c8e365c04f753bef6614e
+Subproject commit fa05d3fcdfa92d51c9c3f5b4746748d29ad168c4
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
index f9de358..1d41d1c 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
@@ -164,9 +164,9 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             params.put("deptIdList", user.getDeptIdList());
         }
         List<EpidemicRecordListDTO> list = baseDao.getEpidemicUserRecordList(params);
-        for (EpidemicRecordListDTO eru : list) {
-            eru.setUserName(nameDesensitization(eru.getUserName()));
-        }
+//        for (EpidemicRecordListDTO eru : list) {
+//            eru.setUserName(nameDesensitization(eru.getUserName()));
+//        }
         return new PageData<>(list, page.getTotal());
     }
 
@@ -180,7 +180,10 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             result.setAllDeptIds(result.getAllDeptIds().replace(result.getAllDeptIds().substring(0, result.getAllDeptIds().indexOf(",") + 1), ""));
             result.setDeptIdList(result.getAllDeptIds().split(","));
         }
-        result.setUserName(nameDesensitization(result.getUserName()));
+//        result.setUserName(nameDesensitization(result.getUserName()));
+//        result.setIdCard(idEncrypt(result.getIdCard()));
+//        result.setMobile(mobileEncrypt(result.getMobile()));
+//        result.setUserName(nameDesensitization(result.getUserName()));
         result.setRelationPeople(nameDesensitization(result.getRelationPeople()));
         if (StringUtils.isNotBlank(result.getHouseholdRegisterCode())) {
             result.setHouseholdRegisterCodes(result.getHouseholdRegisterCode().split(","));