个人档案-家庭关系bug修改

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -1114,11 +1114,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         //获取用户信息
         IcResiUserEntity user = baseDao.selectById(userId);
         result.setOwnerName("");
+        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());
@@ -1134,6 +1136,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     return bean;
                 }).collect(Collectors.toList());
                 result.setUserList(userList);
+            }
+        }
         return result;
     }