Merge remote-tracking branch 'remotes/origin/dev_pingyin_7_22' into pingyin_master

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java

@@ -226,7 +226,8 @@ public class BaseGridDailyworkServiceImpl extends BaseServiceImpl<BaseGridDailyw
             data.forEach(d -> {
                 GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(d.getGridId());
                 if (null == gridInfo){
-                    throw new EpmetException("未查询到网格信息："+ d.getGridId());
+                    log.warn("未查询到网格信息："+ d.getGridId());
+                    return;
                 }
                 d.setGridCode(gridInfo.getCode());
                 d.setGridName(gridInfo.getGridName());