Merge branch 'feature/dev_sunjiatan_moveout'

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);