opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-19 09:55:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !587 from AprilWind/dev

Browse Source
This commit is contained in:
AprilWind 2024-09-13 05:52:56 +00:00 committed by Gitee
commit d4d25b85de
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java
View File

@ -130,7 +130,7 @@ public class TenantHelper {
if (!isEnable()) { if (!isEnable()) {
return; return;
} }
if (!isLogin() || !global) { if (!StpUtil.isLogin() || !global) {
TEMP_DYNAMIC_TENANT.set(tenantId); TEMP_DYNAMIC_TENANT.set(tenantId);
return; return;
} }
@ -147,7 +147,7 @@ public class TenantHelper {
if (!isEnable()) { if (!isEnable()) {
return null; return null;
} }
if (!isLogin()) { if (!StpUtil.isLogin()) {
return TEMP_DYNAMIC_TENANT.get(); return TEMP_DYNAMIC_TENANT.get();
} }
// 如果线程内有值 优先返回 // 如果线程内有值 优先返回
@ -167,7 +167,7 @@ public class TenantHelper {
if (!isEnable()) { if (!isEnable()) {
return; return;
} }
if (!isLogin()) { if (!StpUtil.isLogin()) {
TEMP_DYNAMIC_TENANT.remove(); TEMP_DYNAMIC_TENANT.remove();
return; return;
} }
@ -218,13 +218,4 @@ public class TenantHelper {
return tenantId; return tenantId;
} }
private static boolean isLogin() {
try {
StpUtil.checkLogin();
return true;
} catch (Exception e) {
return false;
}
}
} }