Merge branch 'dev_personal_center' into dev_temp

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/TopicServiceImpl.java

@@ -58,6 +58,9 @@ public class TopicServiceImpl implements TopicService {
         }
 
         List<ProjectOfCreateTopicUserResultDTO> projects = result.getData();
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(projects)) {
+            return new ArrayList();
+        }
 
         List<MyShiftProjectTopicsResultDTO> projectTopics = ConvertUtils.sourceToTarget(projects, MyShiftProjectTopicsResultDTO.class);
         List<String> gridIds = projects.stream().map(p -> p.getGridId()).collect(Collectors.toList());
@@ -67,9 +70,11 @@ public class TopicServiceImpl implements TopicService {
             logger.error("查询我创建的话题列表(已转项目),根据网格id查询网格名称失败, InternalMsg:{},Msg:{}", rst.getInternalMsg(), rst.getMsg());
         } else {
             List<AllGridsByUserIdResultDTO> gridInfos = rst.getData();
-            HashMap<String, String> gridIdAndNames = new HashMap<>();
-            gridInfos.stream().forEach(g -> gridIdAndNames.put(g.getGridId(), g.getGridName()));
-            projectTopics.stream().forEach(pt -> pt.setReleaseGridName(gridIdAndNames.get(pt.getGridId())));
+            if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(gridInfos)) {
+                HashMap<String, String> gridIdAndNames = new HashMap<>();
+                gridInfos.stream().forEach(g -> gridIdAndNames.put(g.getGridId(), g.getGridName()));
+                projectTopics.stream().forEach(pt -> pt.setReleaseGridName(gridIdAndNames.get(pt.getGridId())));
+            }
         }
 
         return projectTopics;