From 06cc5e8ac40c6a17b62903bd36f502908cacd003 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 9 Sep 2022 09:35:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=AF=E5=90=A6=E8=82=B2?=
 =?UTF-8?q?=E9=BE=84=E5=A6=87=E5=A5=B3=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/IcResiUserServiceImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 3c146c3f31..648d315953 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -3362,6 +3362,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
      * @Date 2022/9/8 15:45
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void updateYlfn() {
         //获取育龄妇女配置
         Result<List<YlfnValueResultDTO>> value = operCustomizeOpenFeignClient.getYlfnValue();
@@ -3374,12 +3375,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             wrapper.eq(IcResiUserEntity::getCustomerId, item.getCustomerId());
             wrapper.eq(IcResiUserEntity::getGender, NumConstant.TWO_STR);
             wrapper.eq(IcResiUserEntity::getStatus, NumConstant.ZERO_STR);
-            wrapper.eq(IcResiUserEntity::getIdCardType, NumConstant.ONE_STR);
             List<IcResiUserEntity> list = baseDao.selectList(wrapper);
             if (CollectionUtils.isNotEmpty(list)) {
                 list.forEach(user -> {
                     IdCardRegexUtils pares = IdCardRegexUtils.parse(user.getIdCard());
-                    if (NumConstant.ONE_STR.equals(pares.getTypeEnum().getType())) {
+                    if (null != pares && NumConstant.ONE_STR.equals(pares.getTypeEnum().getType())) {
                         if (!NumConstant.ONE_STR.equals(user.getIsYlfn())) {
                             //将不是育龄妇女的变为育龄妇女
                             if (pares.getParsedResult().getAge() >= item.getMin() && pares.getParsedResult().getAge() <= item.getMax()) {