From 7893bd38b124a1a6ce53db771e9531998099edb7 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 10 May 2022 15:11:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=81=E5=87=BA=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=EF=BC=8C=E8=B0=83=E5=8A=A8=E5=85=A5=E5=8F=82=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC=E5=B0=91=E4=BA=86=E8=B0=83=E5=8A=A8=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/result/SyncResiResDTO.java     | 3 ++-
 .../java/com/epmet/service/impl/IcResiUserServiceImpl.java     | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java
index e42ee5417a..d41206b132 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java
@@ -50,7 +50,7 @@ public class SyncResiResDTO implements Serializable {
      * 身份证号已存在的居民，返回其房屋id
      */
     private String resiHomeId;
-
+    private String status;
     public SyncResiResDTO(String customerId, String idCard, String agencyId) {
         this.idCard = idCard;
         this.customerId = customerId;
@@ -59,5 +59,6 @@ public class SyncResiResDTO implements Serializable {
         this.resiAgencyId = StrConstant.EPMETY_STR;
         this.resiAgencyName = StrConstant.EPMETY_STR;
         this.resiHomeId = StrConstant.EPMETY_STR;
+        this.status=StrConstant.EPMETY_STR;
     }
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index d8d078f4c5..2a30a595fd 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -1819,6 +1819,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             return resiResDTO;
         }
         //当前客户下，存在同身份证号的居民
+        resiResDTO.setStatus(icResiUserDTO.getStatus());
         resiResDTO.setResiAgencyId(icResiUserDTO.getAgencyId());
         resiResDTO.setResiHomeId(icResiUserDTO.getHomeId());
         AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(resiResDTO.getResiAgencyId());