gxwebsoft/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(auth): 注释非超级管理员登录限制逻辑

Browse Source 
- 注释掉单租户登录时对非超级管理员账号的限制判断
- 避免非超级管理员登录时返回错误拦截
- 保持其他登录及账号状态判断逻辑不变
- 允许更多用户类型能正常登录系统
This commit is contained in:
赵忠林
2026-07-27 11:46:28 +08:00
parent 9fdc708bb8
commit 3bacfe8b8f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/gxwebsoft/common/system/controller/MainController.java
View File

@@ -990,11 +990,11 @@ public class MainController extends BaseController {
// 单租户：直接登录（现有逻辑不变，单租户用户无感知） // 单租户：直接登录（现有逻辑不变，单租户用户无感知）
if (superAdmins.size() == 1) { if (superAdmins.size() == 1) {
User user = superAdmins.get(0); User user = superAdmins.get(0);
if (!Boolean.TRUE.equals(user.getIsSuperAdmin())) { // if (!Boolean.TRUE.equals(user.getIsSuperAdmin())) {
String message = "非超级管理员账号不允许登录"; // String message = "非超级管理员账号不允许登录";
loginRecordService.saveAsync(phone, LoginRecord.TYPE_ERROR, message, user.getTenantId(), request); // loginRecordService.saveAsync(phone, LoginRecord.TYPE_ERROR, message, user.getTenantId(), request);
return fail(message, null); // return fail(message, null);
} // }
if (!user.getStatus().equals(0)) { if (!user.getStatus().equals(0)) {
String message = "账号被冻结"; String message = "账号被冻结";
loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_ERROR, message, user.getTenantId(), request); loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_ERROR, message, user.getTenantId(), request);
@@ -1057,11 +1057,11 @@ public class MainController extends BaseController {
loginRecordService.saveAsync(phone, LoginRecord.TYPE_ERROR, message, param.getTenantId(), request); loginRecordService.saveAsync(phone, LoginRecord.TYPE_ERROR, message, param.getTenantId(), request);
return fail(message, null); return fail(message, null);
} }
if (!Boolean.TRUE.equals(user.getIsSuperAdmin())) { // if (!Boolean.TRUE.equals(user.getIsSuperAdmin())) {
String message = "非超级管理员账号不允许登录"; // String message = "非超级管理员账号不允许登录";
loginRecordService.saveAsync(phone, LoginRecord.TYPE_ERROR, message, user.getTenantId(), request); // loginRecordService.saveAsync(phone, LoginRecord.TYPE_ERROR, message, user.getTenantId(), request);
return fail(message, null); // return fail(message, null);
} // }
String access_token = generateToken(user); String access_token = generateToken(user);
loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_LOGIN, null, user.getTenantId(), request); loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_LOGIN, null, user.getTenantId(), request);