update 优化 getTenantId 判断是否开启多租户

2023-11-29 00:37:00 +08:00 · 2023-11-29 00:37:00 +08:00 · 40ec6584c5
commit 40ec6584c5
parent d811cb8e04
1 changed files with 3 additions and 0 deletions
--- 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();