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/app/CustomerController.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
index d38bd36..563370b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
@@ -121,16 +121,16 @@
if (!MatchUtils.isMobileNO(tjCustomer.getCusPhone()))
return AjaxResult.error("鎵嬫満鍙烽敊璇�");
- if (cusIdcard.length() == 18) {
+ if (tjCustomer.getIdType().equals("1")) {
if (!MatchUtils.isIdCard(cusIdcard)) {
return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
}
}
- if (cusIdcard.length() == 9) {
- if (!MatchUtils.cardValidates(cusIdcard)) {
- return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
- }
- }
+// if (cusIdcard.length() == 9) {
+// if (!MatchUtils.cardValidates(cusIdcard)) {
+// return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
+// }
+// }
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
wq.eq(TjCustomer::getCusIdcard, cusIdcard);
@@ -146,7 +146,11 @@
String substring = cusIdcard.substring(cusIdcard.length() - 6);
substring = DigestUtils.md5DigestAsHex(substring.getBytes());
tjCustomer.setCusPassword(substring);
- tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(cusIdcard), "yyyy-MM-dd"));
+ try {
+ tjCustomer.setCusBrithday(MatchUtils.getBirthDayByIdCard(cusIdcard));
+ } catch (Exception e) {
+ return AjaxResult.error("韬唤璇佸彿涓嶆纭�");
+ }
tjCustomer.setCusSex(Long.valueOf(MatchUtils.getSexByIdCard(cusIdcard)));
tjCustomer.setAge(String.valueOf(MatchUtils.getAgeByIdCard(cusIdcard)));
tjCustomer.setIdType("1");
--
Gitblit v1.8.0