加了个网格

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 (StringUtils.isNotBlank(r.getGridId())){
-                    if (null == gridInfo){
+                        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(r.getGridId());
-                        throw new EpmetException("查询网格失败："+r.getGridId());
+                        if (null == gridInfo){
+                            throw new EpmetException("查询网格失败："+r.getGridId());
+                        }
+                        r.setGridName(gridInfo.getGridNamePath());
                     }
-                    r.setGridName(gridInfo.getGridNamePath());
                 });
             }
         }