From 369ee31801089aa3526723b3ae596572a185c6db Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 30 Nov 2022 14:01:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E4=BA=BA=E5=91=98=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5----=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/ChangeWelfareServiceImpl.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java
index 4b5d11c661..df66afdc38 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java
@@ -294,7 +294,7 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
             if (list.size() > errorInfo.size()){
                 Map<String, Long> groupByIdCard = list.stream().collect(Collectors.groupingBy(ChangeWelfareImportExcel::getIdCard, Collectors.counting()));
                 groupByIdCard.forEach((idCard,count) -> {
-                    if (Integer.valueOf(count.toString()).compareTo(1) != 0){
+                    if (StringUtils.isNotBlank(idCard) && Integer.valueOf(count.toString()).compareTo(1) != 0){
                         for (ChangeWelfareImportExcel i : list) {
                             if (idCard.equals(i.getIdCard()) && !i.getAddStatus()){
                                 errorInfo.add(getErrorInfo(i,"数据重复",i.getNum()));
@@ -363,8 +363,8 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
      * Desc: 文件上传并返回url
      * @param errorRows
      * @param tClass
-     * @author zxc
-     * @date 2022/3/30 09:16
+     * @author wgf
+     * @date 2022/11/28 17:17
      */
     public <T> String importOssUpload(Collection<?> errorRows, Class<T> tClass) throws IOException {
         Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams("导入失败的数据列表","导入失败的数据列表"),