From 5c6b538bce680a0e5d03f6ee69375f3ae25b391b Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 19 Sep 2022 17:36:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E4=B8=AA=E7=BD=91=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcEpidemicSpecialAttentionServiceImpl.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
index 2cec386b53..d621eb4f92 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
@@ -173,11 +173,13 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
             }
             if (CollectionUtils.isNotEmpty(result.getList())){
                 result.getList().forEach(r -> {
-                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(r.getGridId());
-                    if (null == gridInfo){
-                        throw new EpmetException("查询网格失败："+r.getGridId());
+                    if (StringUtils.isNotBlank(r.getGridId())){
+                        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(r.getGridId());
+                        if (null == gridInfo){
+                            throw new EpmetException("查询网格失败："+r.getGridId());
+                        }
+                        r.setGridName(gridInfo.getGridNamePath());
                     }
-                    r.setGridName(gridInfo.getGridNamePath());
                 });
             }
         }