From 917e980a4da2ba3542d78a721949bd0835fe8f80 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 22 Jul 2022 10:29:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E4=B8=BB=E7=9B=B8=E5=85=B3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcResiUserServiceImpl.java   | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 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 0fb60b5bdf..4c310afdae 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
@@ -2430,6 +2430,26 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         if (!icHouseNewResult.success() || null == icHouseNewResult.getData()) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败");
         }
+
+        HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), dto.getHomeId());
+        if (null == houseInfo) {
+            String errorMsg = "获取房屋信息失败";
+            throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode(), errorMsg, errorMsg);
+        }
+        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(houseInfo.getGridId());
+        if (null == gridInfo) {
+            String errorMsg = "获取网格信息失败";
+            throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode(), errorMsg, errorMsg);
+        }
+
+        dto.setCustomerId(tokenDto.getCustomerId());
+        dto.setAgencyId(houseInfo.getAgencyId());
+        dto.setPids(gridInfo.getPids());
+        dto.setGridId(houseInfo.getGridId());
+        dto.setVillageId(houseInfo.getNeighborHoodId());
+        dto.setBuildId(houseInfo.getBuildingId());
+        dto.setUnitId(houseInfo.getBuildingUnitId());
+        dto.setHomeId(dto.getHomeId());
         if (idCard.equals(icHouseNewResult.getData().getOwnerIdCard())) {
             dto.setIsOwner(true);
         }
@@ -2482,25 +2502,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             }
         }
 
-        HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), dto.getHomeId());
-        if (null == houseInfo) {
-            String errorMsg = "获取房屋信息失败";
-            throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode(), errorMsg, errorMsg);
-        }
-        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(houseInfo.getGridId());
-        if (null == gridInfo) {
-            String errorMsg = "获取网格信息失败";
-            throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode(), errorMsg, errorMsg);
-        }
-
-        dto.setCustomerId(tokenDto.getCustomerId());
-        dto.setAgencyId(houseInfo.getAgencyId());
-        dto.setPids(gridInfo.getPids());
-        dto.setGridId(houseInfo.getGridId());
-        dto.setVillageId(houseInfo.getNeighborHoodId());
-        dto.setBuildId(houseInfo.getBuildingId());
-        dto.setUnitId(houseInfo.getBuildingUnitId());
-        dto.setHomeId(dto.getHomeId());
 
         IcResiUserEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserEntity.class);
         this.setIcResiUserPids(entity);