From 045e09f029a9d12685d57f4df97df8e1b9bdb1f0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 19 六月 2024 10:12:08 +0800
Subject: [PATCH] reset 回滚三方授权修改
---
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
index d340229..af6e7f5 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
@@ -221,17 +221,17 @@
*
* @param tenantId 绉熸埛ID
*/
- public SysTenantVo checkTenant(String tenantId) {
+ public void checkTenant(String tenantId) {
if (!TenantHelper.isEnable()) {
- return null;
+ return;
+ }
+ if (TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) {
+ return;
}
if (StringUtils.isBlank(tenantId)) {
throw new TenantException("tenant.number.not.blank");
}
SysTenantVo tenant = tenantService.queryByTenantId(tenantId);
- if (TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) {
- return tenant;
- }
if (ObjectUtil.isNull(tenant)) {
log.info("鐧诲綍绉熸埛锛歿} 涓嶅瓨鍦�.", tenantId);
throw new TenantException("tenant.not.exists");
@@ -243,7 +243,6 @@
log.info("鐧诲綍绉熸埛锛歿} 宸茶秴杩囨湁鏁堟湡.", tenantId);
throw new TenantException("tenant.expired");
}
- return tenant;
}
}
--
Gitblit v1.9.3