From 3d288eac55c3ee600d9111cf42954474c5d3cd90 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 13 Jul 2022 14:06:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=98=E6=9B=B4=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E7=9A=84isUserId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcResiUserServiceImpl.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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 8851d1bd89..2cbc81a9bd 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
@@ -2876,7 +2876,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         saveForm.setIdCard(form.getIdCard());
 
         // 添加变更记录
-        formDTO.setIcUserId(residentDetailByIdCard.getResidentId().toString());
         formDTO.setType("in");
         formDTO.setNewAgencyId(houseInfo.getAgencyId());
         formDTO.setNewNeighborHoodId(houseInfo.getNeighborHoodId());
@@ -2888,15 +2887,21 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
         if (baseDao.selectCountByIdCard(form.getIdCard(), form.getCustomerId()) > 0) {
            String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard());
+           // 变更记录
+           formDTO.setIcUserId(id);
+           icUserTransferRecordService.add(formDTO);
+
            baseDao.updateIcResiUserByIdCard(entity);
            saveForm.setIcResiUserId(id);
         } else {
             baseDao.insert(entity);
-            // 变更记录
-            icUserTransferRecordService.add(formDTO);
 
             String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard());
             saveForm.setIcResiUserId(id);
+            formDTO.setIcUserId(id);
+
+            // 变更记录
+            icUserTransferRecordService.add(formDTO);
         }
         guardarDatosFeignClient.saveCaResidentUser(saveForm);
     }