From dc261c2f9fd0338c7bb1c299209ca802f47a122a Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 19 Apr 2022 13:58:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8E=E6=88=BF=E4=B8=BB=E5=85=B3=E7=B3=BB?=
 =?UTF-8?q?=E6=98=AF=E6=9C=AC=E4=BA=BA=E7=9A=84=EF=BC=8C=E4=B8=BA=E6=88=BF?=
 =?UTF-8?q?=E4=B8=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/IcResiUserServiceImpl.java   | 13 +++++--------
 1 file changed, 5 insertions(+), 8 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 7e376b57ec..1f27a2999d 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
@@ -1036,14 +1036,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         OwnerRelationResultDTO result = new OwnerRelationResultDTO();
         //获取用户信息
         IcResiUserEntity user = baseDao.selectById(userId);
-
-        //获取用户所在家庭的户主
-        Result<IcHouseDTO> houseResult =  govOrgOpenFeignClient.get(user.getHomeId());
-        if (!houseResult.success()) {
-            throw new RenException(houseResult.getCode(),houseResult.getMsg());
-        }
-        result.setOwnerName(houseResult.getData().getOwnerName());
-
+        result.setOwnerName("");
         //获取用户所在家庭里所有人员信息
         LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IcResiUserEntity::getHomeId, user.getHomeId());
@@ -1057,6 +1050,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             if (userId.equals(item.getId())) {
                 bean.setIsSelf(NumConstant.ONE_STR);
             }
+            //如果与房主的关系是本人，则这个人就是房主
+            if (RelationshipEnum.SELF.getCode().equals(item.getYhzgx())) {
+                result.setOwnerName(item.getName());
+            }
             return bean;
         }).collect(Collectors.toList());
         result.setUserList(userList);