From 0c174913162085b5f645e73c223f24e992e5d263 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 6 May 2022 09:26:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=A1=A3=E6=A1=88-=E5=AE=B6?=
 =?UTF-8?q?=E5=BA=AD=E5=85=B3=E7=B3=BBbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcResiUserServiceImpl.java   | 42 ++++++++++---------
 1 file changed, 23 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 acd519fd43..9f859dff88 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
@@ -1114,26 +1114,30 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         //获取用户信息
         IcResiUserEntity user = baseDao.selectById(userId);
         result.setOwnerName("");
-        //获取用户所在家庭里所有人员信息
-        LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(IcResiUserEntity::getHomeId, user.getHomeId());
-        wrapper.orderByAsc(IcResiUserEntity::getYhzgx);
-        List<IcResiUserEntity> resiUserList = baseDao.selectList(wrapper);
-        List<OwnerRelationResultDTO.UserListBean> userList = resiUserList.stream().map(item -> {
-            OwnerRelationResultDTO.UserListBean bean = new OwnerRelationResultDTO.UserListBean();
-            bean.setUserId(item.getId());
-            bean.setUserName(item.getName());
-            bean.setRelation(RelationshipEnum.getEnum(item.getYhzgx()).getName());
-            if (userId.equals(item.getId())) {
-                bean.setIsSelf(NumConstant.ONE_STR);
-            }
-            //如果与房主的关系是本人，则这个人就是房主
-            if (RelationshipEnum.SELF.getCode().equals(item.getYhzgx())) {
-                result.setOwnerName(item.getName());
+        if (null != user) {
+            //获取用户所在家庭里所有人员信息
+            LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(IcResiUserEntity::getHomeId, user.getHomeId());
+            wrapper.orderByAsc(IcResiUserEntity::getYhzgx);
+            List<IcResiUserEntity> resiUserList = baseDao.selectList(wrapper);
+            if (CollectionUtils.isNotEmpty(resiUserList)) {
+                List<OwnerRelationResultDTO.UserListBean> userList = resiUserList.stream().map(item -> {
+                    OwnerRelationResultDTO.UserListBean bean = new OwnerRelationResultDTO.UserListBean();
+                    bean.setUserId(item.getId());
+                    bean.setUserName(item.getName());
+                    bean.setRelation(RelationshipEnum.getEnum(item.getYhzgx()).getName());
+                    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);
             }
-            return bean;
-        }).collect(Collectors.toList());
-        result.setUserList(userList);
+        }
         return result;
     }