福利人员导入，身份证比较不校验大小写

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);
                             }