Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master

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

@@ -1628,8 +1628,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             }
             List<OwnerRelationResultDTO.UserListBean> userList=new ArrayList<>();
             for(IcResiUserEntity item:resiUserList){
-                //成员里排除户主
+                // 成员里排除户主
-                if(!result.getOwnerUserId().equals(item.getId())){
+                if (null == result.getOwnerUserId() || !result.getOwnerUserId().equals(item.getId())) {
                     OwnerRelationResultDTO.UserListBean bean = new OwnerRelationResultDTO.UserListBean();
                     bean.setUserId(item.getId());
                     bean.setUserName(item.getName());
@@ -1644,11 +1644,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                         }
                     }
 
-                    //2022.11.17 返参增加人户状况名称
+                    // 2022.11.17 返参增加人户状况名称
                     bean.setRhzk(item.getRhzk());
-                    if (StringUtils.isBlank(item.getRhzk())){
+                    if (StringUtils.isBlank(item.getRhzk())) {
                         bean.setRenHuCondition(RenHuConditionEnum.ZBQC.getName());
-                    }else {
+                    } else {
                         bean.setRenHuCondition(RenHuConditionEnum.getNameByCode(item.getRhzk()));
                     }
                     userList.add(bean);