From b3ba705b76f97c765dac43bf466070459e42cdc4 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 18 Aug 2022 18:07:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=B2=A1=E6=9C=89=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD=E8=AF=81=E5=8F=B7=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GridstaffInfoPingyinServiceImpl.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/GridstaffInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java
index 3f7fffb0ec..7ee986f3f6 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.CustomerGridStaffListFormDTO;
 import com.epmet.dto.form.GridStaffUploadtFormDTO;
@@ -21,6 +20,7 @@ import com.epmet.opendata.entity.GridstaffInfoPingyinEntity;
 import com.epmet.opendata.service.GridstaffInfoPingyinService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -130,6 +130,10 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffIn
             entity.setLeaveDate(r.getLeaveDate());
             entity.setGridUserId(r.getStaffId());
             entity.setCardNum(r.getIdCard());
+            if (StringUtils.isNotBlank(r.getIdCard())){
+                log.warn("getStaffBaseInfo 身份证号是空的,{}", JSON.toJSONString(entity));
+                return;
+            }
             //按网格查询人员是否存在，存在更新否则新增
             GridstaffInfoPingyinEntity gs = baseDao.selectByCodeAndStaffId(r.getCode(), r.getStaffId());
             log.info(String.format("网格工作人员信息同步，当前操作人员信息，姓名:%s   staffId:%s", entity.getNickName(), entity.getGridUserId()));