From 9611fd719c2b882e44c6418afe7c75eec8f19cf5 Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Mon, 22 Aug 2022 13:49:53 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E3=80=91=E6=8A=A4=E7=85=A7-=E5=B1=85=E6=B0=91=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E3=80=81=E5=AF=BC=E5=85=A5=E3=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcResiUserServiceImpl.java   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

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 d8f57e4e81..3734309c8c 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
@@ -294,6 +294,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 if (isDyzxh) {
                     map.put("IS_VOLUNTEER", NumConstant.ONE_STR);
                 }
+
+                // 证件类型判断----start----
+                IdCardRegexUtils regex = IdCardRegexUtils.parse(map.get("ID_CARD"));
+                if (regex == null) {
+                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "证件号解析错误", "证件号解析错误");
+                }
+                IdCardTypeEnum typeEnum = regex.getTypeEnum();
+                map.put("ID_CARD_TYPE", typeEnum.getType());
+                // 证件类型判断----end----
+
                 //新增主表数据
                 baseDao.add(d.getTableName(), map);
 
@@ -620,6 +630,15 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 map.put("IS_VOLUNTEER", NumConstant.ONE_STR);
             }
             map.put("updated_by", tokenDto.getUserId());
+
+            // 证件类型判断----start----
+            IdCardRegexUtils regex = IdCardRegexUtils.parse(map.get("ID_CARD"));
+            if (regex == null) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "证件号解析错误", "证件号解析错误");
+            }
+            IdCardTypeEnum typeEnum = regex.getTypeEnum();
+            map.put("ID_CARD_TYPE", typeEnum.getType());
+            // 证件类型判断----end----
             baseDao.upTable("ic_resi_user", resiUserId, map);
         }