From cd00884c3db8fa6808b3b5949ab1a2b1459d6bdc Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 11 六月 2025 10:36:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
index 3e7dff6..e577cb7 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
@@ -121,7 +121,7 @@
}
SysUser sysUser = sysUserService.getOne(queryWrapper);
//update-end-author:wangshuai date:20200601 for: 鐧诲綍浠ｇ爜楠岃瘉鐢ㄦ埛鏄惁娉ㄩ攢bug锛宨f鏉′欢姘歌繙涓篺alse
- result = sysUserService.checkUserIsEffective(sysUser);
+ result = sysUserService.checkUserIsEffective(sysUser, loginType);
if(!result.isSuccess()) {
return result;
}
@@ -397,7 +397,7 @@
}else {
//鐧诲綍妯″紡锛屾牎楠岀敤鎴锋湁鏁堟��
SysUser sysUser = sysUserService.getUserByPhone(mobile);
- result = sysUserService.checkUserIsEffective(sysUser);
+ result = sysUserService.checkUserIsEffective(sysUser, null);
if(!result.isSuccess()) {
String message = result.getMessage();
String userNotExist="璇ョ敤鎴蜂笉瀛樺湪锛岃娉ㄥ唽";
@@ -458,7 +458,7 @@
//鏍￠獙鐢ㄦ埛鏈夋晥鎬�
SysUser sysUser = sysUserService.getUserByPhone(phone);
- result = sysUserService.checkUserIsEffective(sysUser);
+ result = sysUserService.checkUserIsEffective(sysUser, null);
if(!result.isSuccess()) {
return result;
}
@@ -626,7 +626,7 @@
//1. 鏍￠獙鐢ㄦ埛鏄惁鏈夋晥
SysUser sysUser = sysUserService.getUserByName(username);
- result = sysUserService.checkUserIsEffective(sysUser);
+ result = sysUserService.checkUserIsEffective(sysUser, null);
if(!result.isSuccess()) {
return result;
}
--
Gitblit v1.9.3