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 categorieDtos = getResultDataOrThrowsException(operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsQuery), - ServiceConstant.OPER_CUSTOMIZE_SERVER, - EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), - "【志愿者分布】志愿者简介-查询志愿者类别失败", - "【志愿者分布】志愿者简介-查询志愿者类别失败"); + List 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));