Merge branch 'wxz_passport'

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

@@ -631,14 +631,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             }
             map.put("updated_by", tokenDto.getUserId());
 
-            // 证件类型判断----start----
+            if (StringUtils.isNotBlank(map.get("ID_CARD"))) {
-            IdCardRegexUtils regex = IdCardRegexUtils.parse(map.get("ID_CARD"));
+                // 证件类型判断----start----
-            if (regex == null) {
+                IdCardRegexUtils regex = IdCardRegexUtils.parse(map.get("ID_CARD"));
-                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "证件号解析错误", "证件号解析错误");
+                if (regex == null) {
-            }
+                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "证件号解析错误", "证件号解析错误");
-            IdCardTypeEnum typeEnum = regex.getTypeEnum();
+                }
-            map.put("ID_CARD_TYPE", typeEnum.getType());
+                IdCardTypeEnum typeEnum = regex.getTypeEnum();
-            // 证件类型判断----end----
+                map.put("ID_CARD_TYPE", typeEnum.getType());
+                // 证件类型判断----end----
+            }
             baseDao.upTable("ic_resi_user", resiUserId, map);
         }