修改：

1.CustomerOrgRedis中未找到网格不抛异常，改由业务代码处理

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java

@@ -59,7 +59,8 @@ public class CustomerOrgRedis {
             throw new RenException("查询网格信息失败...");
         }
         if (null == gridInfoResult.getData()){
-            throw new RenException("没有此网格信息...");
+            //throw new RenException("没有此网格信息...");
+            return null;
         }
         Map<String, Object> map = BeanUtil.beanToMap(gridInfoResult.getData(), false, true);
         customerOrgRedis.redisUtils.hMSet(key, map);

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java

@@ -19,11 +19,14 @@ import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import sun.rmi.runtime.Log;
 
 import java.util.*;
 
+@Slf4j
 @Service
 public class AggreGridServiceImpl implements AggreGridService {
 
@@ -101,6 +104,10 @@ public class AggreGridServiceImpl implements AggreGridService {
         for (GridMemberDataAnalysisResultDTO data : datas) {
             // 填充gridName
             GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(data.getGridId());
+            if (gridInfo == null) {
+                log.warn("未找到网格信息:{}", data.getGridId());
+                continue;
+            }
             Optional.ofNullable(gridInfo).ifPresent((d) -> data.setOrgName(d.getGridName()));
 
             // 生成结构化map

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java

@@ -42,6 +42,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import sun.jvm.hotspot.memory.ContiguousSpace;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -397,6 +398,10 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
                     l.setGridName(agencyInfo.getOrganizationName());
                 }else {
                     GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(l.getOrgId());
+                    if (gridInfo == null) {
+                        log.warn("未找到网格信息:{}", l.getOrgId());
+                        return;
+                    }
                     l.setGridName(gridInfo.getGridNamePath());
                 }
             });

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java

@@ -100,6 +100,10 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
         dtoList.forEach(item -> {
             if (StringUtils.isNotBlank(item.getGridId())) {
                 GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId());
+                if(gridInfo == null) {
+                    log.warn("未找到网格信息:{}", item.getGridId());
+                    return;
+                }
                 item.setGridName(gridInfo.getGridName());
             }
         });
@@ -191,6 +195,10 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
         dtoList.forEach(item -> {
             if (StringUtils.isNotBlank(item.getGridId())) {
                 GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId());
+                if (gridInfo == null) {
+                    log.warn("未找到网格信息:{}", item.getGridId());
+                    return;
+                }
                 item.setGridName(gridInfo.getGridName());
             }
         });