From 263054cb0f3893821833ec4ec7dc11ce07403176 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 28 Dec 2020 15:54:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98-=E5=85=A8=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/service/govissue/impl/GovIssueServiceImpl.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
index 5c37532bdd..6f0479a1f5 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
@@ -92,7 +92,9 @@ public class GovIssueServiceImpl implements GovIssueService {
                 result.setIssueList(resultClosedOrVoting);
                 result.setTotal(resultClosedOrVoting.size());
         }
-        result.getIssueList().forEach(issue -> gridsInfoList.stream().filter(g -> issue.getGridId().equals(g.getGridId())).forEach(g -> issue.setBelongsGridName(g.getGridName())));
+        if (!CollectionUtils.isEmpty(gridsInfoList)){
+            result.getIssueList().forEach(issue -> gridsInfoList.stream().filter(g -> issue.getGridId().equals(g.getGridId())).forEach(g -> issue.setBelongsGridName(g.getGridName())));
+        }
         return result;
     }