From ed2bc686ddf16b66d13294a7068980e7c2c1c5d6 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 7 Jun 2022 17:22:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=88=BF=E5=B1=8Bbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/MyHomeServiceImpl.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java
index 8184dbcfae..eba820dc92 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java
@@ -115,12 +115,13 @@ public class MyHomeServiceImpl implements MyHomeService {
         if (CollectionUtils.isNotEmpty(roleList) && roleList.contains("registered_resi")) {
             //更新user_resi_info和user_base_info的信息
             UserResiInfoEntity userResiInfo = new UserResiInfoEntity();
+            userResiInfo.setUserId(formDTO.getUserId());
             userResiInfo.setSurname(formDTO.getSurname());
             userResiInfo.setName(formDTO.getName());
             userResiInfo.setIdNum(formDTO.getIdCard());
             userResiInfo.setRegMobile(formDTO.getMobile());
             userResiInfo.setResiVisitId(formDTO.getVisitId());
-            userResiInfo.setDistrict(formDTO.getAddress());
+            userResiInfo.setStreet(formDTO.getAddress());
 
             LambdaQueryWrapper<UserResiInfoEntity> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(UserResiInfoEntity::getCustomerId, formDTO.getCustomerId());
@@ -141,10 +142,11 @@ public class MyHomeServiceImpl implements MyHomeService {
             userResiRegisterVisitDao.insert(visit);
             //注册居民
             UserResiInfoDTO userResiInfoDTO = ConvertUtils.sourceToTarget(formDTO, UserResiInfoDTO.class);
+            userResiInfoDTO.setUserId(formDTO.getUserId());
             userResiInfoDTO.setIdNum(formDTO.getIdCard());
             userResiInfoDTO.setRegMobile(formDTO.getMobile());
             userResiInfoDTO.setResiVisitId(visit.getId());
-            userResiInfoDTO.setDistrict(formDTO.getAddress());
+            userResiInfoDTO.setStreet(formDTO.getAddress());
             userResiInfoDTO.setCustomerId(formDTO.getCustomerId());
             userResiInfoDTO.setApp("resi");
             userResiInfoService.saveResiInfo(userResiInfoDTO);