From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
index d0b0c52..da20150 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
@@ -98,15 +98,16 @@
if (loginBody.getMobile()) {
token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getType(), loginBody.getCode(), loginBody.getUuid());
} else {
- token = loginService.Cuslogin(loginBody.getUsername(), loginBody.getPassword(), loginBody.getType(), loginBody.getCode(), loginBody.getUuid());
+ token = loginService.Cuslogin(loginBody.getUsername(),loginBody.getSfzh(), loginBody.getPassword(), loginBody.getType(), loginBody.getCode(), loginBody.getUuid());
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
wq.eq(TjCustomer::getCusPhone, loginBody.getUsername());
+ wq.eq(TjCustomer::getCusIdcard, loginBody.getSfzh());
TjCustomer tjCustomer = customerService.getOne(wq);
List<Map<String ,Object>> customer = tjCustomerMapper.getCusInfoListByCardAndName(tjCustomer.getCusIdcard(),tjCustomer.getCusName());
ajax.put("orderList",customer);
}
if (null == token) {
- return success("璇ヨ处鍙锋鍦ㄤ娇鐢ㄤ腑");
+ return AjaxResult.error("鐧诲綍澶辫触!");
}
ajax.put(Constants.TOKEN, token);
return ajax;
--
Gitblit v1.8.0