From b486f8287910afa535c9bec9a911a60a53bfc8b2 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 7 Dec 2022 15:34:43 +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=992?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/ChangeWelfareServiceImpl.java | 11 ++++++++--- 1 file changed, 8 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 f158bbc968..890d978efb 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 @@ -255,15 +255,20 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl idCardList = new ArrayList<>(); for(IcResiUserDTO icResiUserDTO : userList){ idCardList.add(icResiUserDTO.getIdCard()); - if(icResiUserDTO.getIdCard().indexOf("X") >= 0){ + if(icResiUserDTO.getIdCard() != null && icResiUserDTO.getIdCard().indexOf("X") >= 0){ idCardList.add(icResiUserDTO.getIdCard().replace("X","x")); } } - // 获取已存在福利人员 + // 获取已存在福利人员(排除X的大小写区分) List welfareList = baseDao.getAllWelfareIdCard(tokenDto.getCustomerId()); - + for(String idCard : welfareList){ + idCardList.add(idCard); + if(StringUtils.isNotBlank(idCard) && idCard.indexOf("X") >= 0){ + idCardList.add(idCard.replace("X","x")); + } + } for (int i = 0; i < list.size(); i++) { list.get(i).setNum(i+1);