bugfix

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());
     }