【五大图层】居民信息接口新增"居民类别名称"列返回，字符串

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;
 
     /**
      * 同屋的其他人

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.setResiCategoryNames(String.join("、", resiCategoryNames));
-        r.setResiCategories(resiCategories);
 
         return r;
     }