Merge remote-tracking branch 'origin/wxz_passport' into wxz_passport

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);
         }