From 7c0edd27f13f4964c85460984ddd543b644dbac2 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 7 Dec 2022 15:47:56 +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=EF=BC=8C=E8=BA=AB=E4=BB=BD=E8=AF=81=E6=AF=94=E8=BE=83?=
 =?UTF-8?q?=E4=B8=8D=E6=A0=A1=E9=AA=8C=E5=A4=A7=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/ChangeWelfareServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 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 890d978efb..d94e59b705 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
@@ -286,7 +286,7 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
                 }else if(idCardList.contains(list.get(i).getIdCard()) && !list.get(i).getAddStatus()){
                     // 组装居民数据
                     for(IcResiUserDTO icResiUserDTO : userList){
-                        if(list.get(i).getIdCard().equals(icResiUserDTO.getIdCard())){
+                        if(list.get(i).getIdCard().equalsIgnoreCase(icResiUserDTO.getIdCard())){
                             list.get(i).setGender(icResiUserDTO.getGender());
                             list.get(i).setMobile(icResiUserDTO.getMobile());
                             list.get(i).setName(icResiUserDTO.getName());
@@ -310,7 +310,7 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
                 groupByIdCard.forEach((idCard,count) -> {
                     if (!"10110".equals(idCard) && Integer.valueOf(count.toString()).compareTo(1) != 0){
                         for (ChangeWelfareImportExcel i : list) {
-                            if (idCard.equals(i.getIdCard()) && !i.getAddStatus()){
+                            if (idCard.equalsIgnoreCase(i.getIdCard()) && !i.getAddStatus()){
                                 errorInfo.add(getErrorInfo(i,"数据重复",i.getNum()));
                                 i.setAddStatus(true);
                             }