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/EventreportPingyinServiceImpl.java

@@ -107,7 +107,9 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
                     }
                 }
             }
-
+            if (StringUtils.isBlank(entity.getGridUserCardid())) {
+                log.warn("项目" + item.getId() + "的网格员没有身份证ID，舍弃该条数据");
+            }
             entity.setReportTime(item.getReportTime());
             entity.setHappenTime(item.getHappenDate());
             entity.setHappenPlace(item.getHappenPlace());
@@ -136,6 +138,8 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
             }
             return entity;
         }).collect(Collectors.toList());
+        //过滤掉身份证为空的数据
+        entityList = entityList.stream().filter(item -> StringUtils.isNotBlank(item.getGridUserCardid())).collect(Collectors.toList());
         if (NumConstant.ZERO_STR.equals(initFlag)) {
             entityList.forEach(entity -> {
                 LambdaQueryWrapper<EventreportPingyinEntity> wrapper = new LambdaQueryWrapper<>();