Merge branch 'dev'

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -1470,20 +1470,23 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         HashMap<String, String> gridIdAndNames = new HashMap<>();
         List<String> gridIds = myTopics.stream().map(c -> c.getReleaseGridId()).collect(Collectors.toList());
 
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(gridIds)) {
+            return myTopics;
+        }
+
         Result<List<AllGridsByUserIdResultDTO>> gridsResult = govOrgOpenFeignClient.getGridListByGridIds(gridIds);
         if (gridsResult.success()) {
             List<AllGridsByUserIdResultDTO> grids = gridsResult.getData();
             if (grids != null && grids.size() != 0) {
                 grids.stream().forEach(g -> gridIdAndNames.put(g.getGridId(), g.getGridName()));
+                for (MyCreateTopicsResultDTO myTopic : myTopics) {
+                    myTopic.setReleaseGridName(gridIdAndNames.get(myTopic.getReleaseGridId()));
+                }
             }
         } else {
             log.error("【我创建的话题列表】，查询组织-网格名称出错，没有抛出，内部处理。内部消息:{},外部消息:{}", gridsResult.getInternalMsg(), gridsResult.getMsg());
         }
 
-        for (MyCreateTopicsResultDTO myTopic : myTopics) {
-            myTopic.setReleaseGridName(gridIdAndNames.get(myTopic.getReleaseGridId()));
-        }
-
         return myTopics;
     }