Merge branch 'dev'

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

@@ -1473,7 +1473,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         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()));
+            }
         } else {
             log.error("【我创建的话题列表】，查询组织-网格名称出错，没有抛出，内部处理。内部消息:{},外部消息:{}", gridsResult.getInternalMsg(), gridsResult.getMsg());
         }