From a21c8a633927689a5fa8245b4e5a47bd6833d27b Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 7 Dec 2022 15:12:33 +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=A0=A1=E9=AA=8C?= =?UTF-8?q?=E4=B8=8D=E6=A0=A1=E9=AA=8CX=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/ChangeWelfareServiceImpl.java | 12 ++++++++++-- 1 file changed, 10 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 c7582ec8ef..f158bbc968 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 @@ -250,8 +250,16 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl userList = icResiUserDao.getImportUserList(tokenDto.getCustomerId(),staffInfoCache.getAgencyId()); - // 获取证件号List - List idCardList = userList.stream().map(IcResiUserDTO::getIdCard).collect(Collectors.toList()); + // 获取证件号List(排除X的大小写区分) +// List idCardList = userList.stream().map(IcResiUserDTO::getIdCard).collect(Collectors.toList()); + List idCardList = new ArrayList<>(); + for(IcResiUserDTO icResiUserDTO : userList){ + idCardList.add(icResiUserDTO.getIdCard()); + if(icResiUserDTO.getIdCard().indexOf("X") >= 0){ + idCardList.add(icResiUserDTO.getIdCard().replace("X","x")); + } + } + // 获取已存在福利人员 List welfareList = baseDao.getAllWelfareIdCard(tokenDto.getCustomerId());