From 79640cf5d2f2b4e444e8805fc3a0233bf3ebc23e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 18 Oct 2022 15:15:48 +0800
Subject: [PATCH] =?UTF-8?q?/resi/partymember/icPartyMember/157032292946977?=
 =?UTF-8?q?587=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=BA=AB=E4=BB=BD=E8=AF=81?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi/partymember/dto/partymember/IcPartyMemberDTO.java  | 3 ++-
 .../partymember/controller/IcPartyMemberController.java     | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java
index 9832a35e5e..74c7166a2c 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java
@@ -63,7 +63,8 @@ public class IcPartyMemberDTO implements Serializable {
      */
     @NotBlank(message = "当前网格id不能为空",groups ={AddGroup.class, UpdateGroup.class})
 	private String mobile;
-
+    private String showMobile;
+    private String showIdCard;
     /**
      * 身份证号
      */
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java
index 84c079c14a..7628cfbb82 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java
@@ -89,10 +89,14 @@ public class IcPartyMemberController implements ResultDataResolver {
         return new Result<PageData<IcPartyMemberResultDTO>>().ok(page);
     }
 
-    @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
+    @MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
     @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
     public Result<IcPartyMemberDTO> get(@LoginUser TokenDto tokenDto, @PathVariable("id") String id){
         IcPartyMemberDTO data = icPartyMemberService.get(tokenDto, id);
+        if(null!=data){
+            data.setShowMobile(data.getMobile());
+            data.setShowIdCard(data.getIdCard());
+        }
         return new Result<IcPartyMemberDTO>().ok(data);
     }
     @NoRepeatSubmit