From 77f771b7260b372d2350afbecf5923d5a63a3844 Mon Sep 17 00:00:00 2001 From: Looly Date: Fri, 2 Jun 2023 17:11:05 +0800 Subject: [PATCH] fix code --- .../main/java/org/dromara/hutool/core/data/IdcardUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/IdcardUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/IdcardUtil.java index 585cdecf5..bc25d9a10 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/IdcardUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/IdcardUtil.java @@ -168,7 +168,7 @@ public class IdcardUtil { * @param idCard 18位身份编码 * @return 15位身份编码 */ - public static String convert18To15(String idCard) { + public static String convert18To15(final String idCard) { if (StrUtil.isNotBlank(idCard) && IdcardUtil.isValidCard18(idCard)) { return idCard.substring(0, 6) + idCard.substring(8, idCard.length() - 1); } @@ -559,7 +559,7 @@ public class IdcardUtil { public static int getGender(String idcard) { Assert.notBlank(idcard); final int len = idcard.length(); - if (len < CHINA_ID_MIN_LENGTH) { + if (!(len == CHINA_ID_MIN_LENGTH || len == CHINA_ID_MAX_LENGTH)) { throw new IllegalArgumentException("ID Card length must be 15 or 18"); }