From ea5f8942d63ca560f977d8394827d34debc886f9 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 27 Jun 2022 14:51:59 +0800
Subject: [PATCH] bugfix

---
 .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
index d27c32445e..c1acbcd859 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
@@ -881,7 +881,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         //2、查询分类名称
         List<String> categoryCodes=demandList.stream().map(DemandRecResultDTO::getCategoryCode).collect(Collectors.toList());
         List<IcResiDemandDictEntity> dictList=demandDictService.listByCodes(customerId,categoryCodes);
-        Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcResiDemandDictEntity::getCategoryCode, IcResiDemandDictEntity::getCategoryName));
+        Map<String, String> dictMap = dictList.stream().filter(d->StringUtils.isNotBlank(d.getCategoryName())).collect(Collectors.toMap(IcResiDemandDictEntity::getCategoryCode, IcResiDemandDictEntity::getCategoryName));
 
         //3、查询爱心互助志愿者
         // 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
@@ -1772,7 +1772,10 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         List<DemandRecResultDTO> list = baseDao.pageListAnalysis(queryForm);
 
         // 填充信息
-        fillDemandsInfo(list, customerId);
+        if(CollectionUtils.isNotEmpty(list)){
+            fillDemandsInfo(list, customerId);
+        }
+
 
         return new PageData<>(list, new PageInfo<>(list).getTotal());
     }