From 2fd5723dead27987f78bdc35dd61926740694371 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 21 Jul 2022 16:00:27 +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   | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 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 29bddc84a8..5e3003a703 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
@@ -2418,9 +2418,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     @Override
     public Result addMember(TokenDto tokenDto,IcResiUserConfirmSubmitDTO dto) {
-        IcResiUserEntity user = icResiUserDao.selectById(dto.getIcResiUserId());
-
-        IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(dto.getIdCard(), user.getCustomerId());
+        IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(dto.getIdCard(), tokenDto.getCustomerId());
         String idCard = "";
         ResiUserInfoCache resiUserInfo = CustomerResiUserRedis.getUserBaseInfo(tokenDto.getUserId());
         if (null != resiUserInfo) {
@@ -2475,7 +2473,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         //这个房屋下已经设置了户主后，再次选择户主时提示提示“房屋下已存在户主” PS.户主指与户主关系是本人的用户
         if (RelationshipEnum.SELF.getCode().equals(dto.getYhzgx())) {
             LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(IcResiUserEntity::getHomeId, user.getHomeId());
+            wrapper.eq(IcResiUserEntity::getHomeId, dto.getHomeId());
             wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode());
             List<IcResiUserEntity> entityList = baseDao.selectList(wrapper);
             if (CollectionUtils.isNotEmpty(entityList)) {
@@ -2484,15 +2482,25 @@ 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(user.getCustomerId());
-        dto.setAgencyId(user.getAgencyId());
-        dto.setPids(user.getPids());
-        dto.setGridId(user.getGridId());
-        dto.setVillageId(user.getVillageId());
-        dto.setBuildId(user.getBuildId());
-        dto.setUnitId(user.getUnitId());
-        dto.setHomeId(user.getHomeId());
+        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);