From e1745f5f46c31cee76168e285de820cfc916beda Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Tue, 2 Aug 2022 09:40:41 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?=
 =?UTF-8?q?=E3=80=91=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E"=E5=B1=85=E6=B0=91=E7=B1=BB=E5=88=AB?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0"=E5=88=97=E8=BF=94=E5=9B=9E=EF=BC=8C?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/IcResiUserBriefDTO.java     |  2 +-
 .../epmet/service/impl/IcResiUserServiceImpl.java    | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java
index 12121a4245..87393c2a17 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java
@@ -74,7 +74,7 @@ public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable {
     /**
      * 居民类别
      */
-    private Map<String, String> resiCategories = new HashMap<>();
+    private String resiCategoryNames;
 
     /**
      * 同屋的其他人
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 cf76bb0f2b..b329bee2b8 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
@@ -1466,6 +1466,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         query.eq(IcResiUserEntity::getId, resiUserId);
         IcResiUserEntity resiEntity = baseDao.selectOne(query);
 
+        // 找不到居民，返回空
+        if (resiEntity == null) {
+            return null;
+        }
+
         IcResiUserBriefDTO r = new IcResiUserBriefDTO();
 
         BeanUtil.copyProperties(resiEntity, r);
@@ -1511,18 +1516,17 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         // 3.居民类别填充
         List<String> resiCategoryColumns = Arrays.stream(ResiCategoryEnum.values()).map(c -> c.getColName()).collect(Collectors.toList());
 
-        Map<String, String> resiCategories = new HashMap<>();
+        ArrayList<String> resiCategoryNames = new ArrayList<>();
 
         Map<String, String> categories = icResiUserDao.getCategoryListMap(resiCategoryColumns, resiUserId);
         categories.forEach((k, v) -> {
             if (NumConstant.ONE_STR.equals(v)) {
                 ResiCategoryEnum enumObject = ResiCategoryEnum.getEnum(k);
-                resiCategories.put(k, enumObject.getLabel());
+                resiCategoryNames.add(enumObject.getLabel());
             }
         });
 
-
-        r.setResiCategories(resiCategories);
+        r.setResiCategoryNames(String.join("、", resiCategoryNames));
 
         return r;
     }