From e21ccd16cd59d72aadaacebb6d5c1f9a7a06a180 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 22 Jul 2022 17:19:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E4=BA=8B=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E7=AC=AC=E4=B8=89=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EventreportPingyinServiceImpl.java         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java
index 5c097e2a54..db470aacf0 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java
+++ b/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<>();