指南列表修改

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java

@@ -145,6 +145,7 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         formDTO.setCustomerId(tokenDto.getCustomerId());
         List<GuideListResultDTO> list = baseDao.getGuideList(formDTO);
+        if (CollectionUtils.isNotEmpty(list)) {
             list.forEach(item -> {
                 CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), item.getCreatedId());
                 if (null == staffInfoCache) {
@@ -153,6 +154,7 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
                     item.setCreatedName(staffInfoCache.getRealName());
                 }
             });
+        }
         PageInfo<GuideListResultDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal());
     }
@@ -397,6 +399,7 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
     public PageData<GuideListResultDTO> collectionList(TokenDto tokenDto, PageFormDTO formDTO) {
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         List<GuideListResultDTO> list = baseDao.getCollectionList(tokenDto);
+        if (CollectionUtils.isNotEmpty(list)) {
             list.forEach(item -> {
                 CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), item.getCreatedId());
                 if (null == staffInfoCache) {
@@ -405,6 +408,7 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
                     item.setCreatedName(staffInfoCache.getRealName());
                 }
             });
+        }
         PageInfo<GuideListResultDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal());
     }