Merge branch 'feature/userDtoJar'

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java

@@ -255,15 +255,20 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
             List<String> 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<String> 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);