Merge branch 'dev_guidance' into develop

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

@@ -145,14 +145,16 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> imp
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         formDTO.setCustomerId(tokenDto.getCustomerId());
         List<GuideListResultDTO> list = baseDao.getGuideList(formDTO);
-        list.forEach(item -> {
-            CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), item.getCreatedId());
-            if (null == staffInfoCache) {
-                item.setCategoryName("");
-            } else {
-                item.setCreatedName(staffInfoCache.getRealName());
-            }
-        });
+        if (CollectionUtils.isNotEmpty(list)) {
+            list.forEach(item -> {
+                CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), item.getCreatedId());
+                if (null == staffInfoCache) {
+                    item.setCategoryName("");
+                } else {
+                    item.setCreatedName(staffInfoCache.getRealName());
+                }
+            });
+        }
         PageInfo<GuideListResultDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal());
     }
@@ -397,14 +399,16 @@ 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);
-        list.forEach(item -> {
-            CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), item.getCreatedId());
-            if (null == staffInfoCache) {
-                item.setCategoryName("");
-            } else {
-                item.setCreatedName(staffInfoCache.getRealName());
-            }
-        });
+        if (CollectionUtils.isNotEmpty(list)) {
+            list.forEach(item -> {
+                CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), item.getCreatedId());
+                if (null == staffInfoCache) {
+                    item.setCategoryName("");
+                } else {
+                    item.setCreatedName(staffInfoCache.getRealName());
+                }
+            });
+        }
         PageInfo<GuideListResultDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal());
     }