From 36cac46679e7a39e7f64008b688322e2ee2757b2 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 28 Jun 2022 17:33:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E5=87=BA=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ChangeRelocationServiceImpl.java     | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java
index 1201c79958..e7fcf36e0a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java
@@ -245,15 +245,6 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
             }
 
             if (userInfo.getAgencyId().equals(dto.getAgencyId())) {
-                //更改房屋
-                IcResiUserEntity uerEntity = new IcResiUserEntity();
-                uerEntity.setId(dto.getIcUserId());
-                uerEntity.setGridId(dto.getGridId());
-                uerEntity.setVillageId(dto.getVillageId());
-                uerEntity.setBuildId(dto.getBuildId());
-                uerEntity.setUnitId(dto.getUnitId());
-                uerEntity.setHomeId(dto.getHomeId());
-                icResiUserService.updateById(uerEntity);
                 //组织内走变更流程
                 IcResiUserTransferFormDTO formDTO = new IcResiUserTransferFormDTO();
                 formDTO.setIcUserId(dto.getIcUserId());
@@ -269,6 +260,16 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
                 formDTO.setCustomerId(dto.getCustomerId());
                 formDTO.setStaffId(dto.getStaffId());
                 icUserTransferRecordService.add(formDTO);
+
+                //更改房屋
+                IcResiUserEntity uerEntity = new IcResiUserEntity();
+                uerEntity.setId(dto.getIcUserId());
+                uerEntity.setGridId(dto.getGridId());
+                uerEntity.setVillageId(dto.getVillageId());
+                uerEntity.setBuildId(dto.getBuildId());
+                uerEntity.setUnitId(dto.getUnitId());
+                uerEntity.setHomeId(dto.getHomeId());
+                icResiUserService.updateById(uerEntity);
             } else {
                 //组织外走迁出流程
                 this.saveOutOfInfo(dto);