From f11fddc5b246abc1199fd188b54325d2d2b07916 Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Mon, 27 Jun 2022 10:46:27 +0800
Subject: [PATCH] =?UTF-8?q?/resi-brief=E6=8E=A5=E5=8F=A3=E4=B8=AD=E5=AF=B9?=
 =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E7=9A=84=E6=9F=A5=E8=AF=A2=EF=BC=8C?=
 =?UTF-8?q?=E6=9F=A5=E4=B8=8D=E5=88=B0=E5=AD=97=E5=85=B8=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8=EF=BC=8C=E8=80=8C=E6=98=AF?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0error=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcResiUserServiceImpl.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 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 ccea5eeadc..a39b5b7b01 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
@@ -1738,11 +1738,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         optionsQuery.setCustomerId(customerId);
         optionsQuery.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode());
         optionsQuery.setColumnName("VOLUNTEER_CATEGORY");
-        List<IcFormItemOptionsDTO> categorieDtos = getResultDataOrThrowsException(operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsQuery),
-                ServiceConstant.OPER_CUSTOMIZE_SERVER,
-                EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
-                "【志愿者分布】志愿者简介-查询志愿者类别失败",
-                "【志愿者分布】志愿者简介-查询志愿者类别失败");
+        List<IcFormItemOptionsDTO> categorieDtos = getResultDataOrReturnNull(operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsQuery),
+                ServiceConstant.OPER_CUSTOMIZE_SERVER);
+
+        if (CollectionUtils.isEmpty(categorieDtos)) {
+            return new HashMap();
+        }
 
         return categorieDtos.stream()
                 .collect(Collectors.toMap(IcFormItemOptionsDTO::getOptionValue, IcFormItemOptionsDTO::getOptionLabel));