From 30d7651322cf24470e432f2827e06ae5578d3212 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 04 一月 2024 16:33:48 +0800
Subject: [PATCH] update springboot 3.1.7 => 3.2.1 全面支持虚拟线程 update springboot-admin 3.1.8 => 3.2.0 update springdoc 2.2.0 => 2.3.0 update redisson 3.24.3 => 3.25.2 update hutool 5.8.22 => 5.8.24 update dynamic-ds 4.2.0 => 4.3.0
---
ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java
index 2ef1a22..e830c19 100644
--- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java
+++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java
@@ -167,6 +167,9 @@
* 鑾峰彇褰撳墠绉熸埛id(鍔ㄦ�佺鎴蜂紭鍏�)
*/
public static String getTenantId() {
+ if (!isEnable()) {
+ return null;
+ }
String tenantId = TenantHelper.getDynamic();
if (StringUtils.isBlank(tenantId)) {
tenantId = LoginHelper.getTenantId();
--
Gitblit v1.9.3