From 897ecfac27002ba30529da928d4d54b16185adaf Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 30 Nov 2022 14:16:08 +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=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ChangeWelfareServiceImpl.java        | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 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 df66afdc38..288cfa8cc6 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
@@ -292,17 +292,17 @@ 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 (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()));
-                                i.setAddStatus(true);
-                            }
-                        }
-                    }
-                });
+//                Map<String, Long> groupByIdCard = list.stream().collect(Collectors.groupingBy(ChangeWelfareImportExcel::getIdCard, Collectors.counting()));
+//                groupByIdCard.forEach((idCard,count) -> {
+//                    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()));
+//                                i.setAddStatus(true);
+//                            }
+//                        }
+//                    }
+//                });
             }
             Map<Boolean, List<ChangeWelfareImportExcel>> groupByStatus = list.stream().collect(Collectors.groupingBy(ChangeWelfareImportExcel::getAddStatus));
             List<ChangeWelfareImportExcel> needInsert = groupByStatus.get(false);