From 7e73e7699d55b4b229bef4dc5d89e01aedef5a19 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 19 五月 2025 17:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index b13277d..e3ff6da 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -436,7 +436,7 @@
log.info(tjReservation.getName() + " " + idCard);
}
- if ((sfjysfzh.equalsIgnoreCase("Y") && !MatchUtils.isIdCard(idCard)) ||
+ if ((sfjysfzh.equalsIgnoreCase("Y") && idCard.length()==18 && !MatchUtils.isIdCard(idCard)) ||
(sfjysjh.equalsIgnoreCase("Y") && !MatchUtils.isMobileNO(phoe))) {
wrongList.add(tjReservation.getName() + " " + tjReservation.getIdCard()+"韬唤璇佸彿/鎵嬫満鍙� 鏍煎紡涓嶅噯纭�");
// errMsg = "韬唤璇佸彿/鎵嬫満鍙� 鏍煎紡涓嶅噯纭�";
@@ -570,9 +570,10 @@
if (null != tjReservation.getIdType()) {
if (tjReservation.getIdType().equals("1")) {
b = MatchUtils.isIdCard(tjReservation.getIdCard());
- } else {
- b = MatchUtils.cardValidate(tjReservation.getIdCard(), tjReservation.getIdType());
}
+// else {
+// b = MatchUtils.cardValidate(tjReservation.getIdCard(), tjReservation.getIdType());
+// }
} else {
return AjaxResult.error("璇烽�夋嫨璇佷欢绫诲瀷");
}
--
Gitblit v1.8.0