From 40ec6584c5d3206393469af625b210579653b455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Wed, 29 Nov 2023 00:37:00 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20getTenantId=20?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=BC=80=E5=90=AF=E5=A4=9A?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/common/tenant/helper/TenantHelper.java    | 3 +++
 1 file changed, 3 insertions(+)

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 2ef1a220e..e830c190a 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 @@ public class TenantHelper {
      * 获取当前租户id(动态租户优先)
      */
     public static String getTenantId() {
+        if (!isEnable()) {
+            return null;
+        }
         String tenantId = TenantHelper.getDynamic();
         if (StringUtils.isBlank(tenantId)) {
             tenantId = LoginHelper.getTenantId();