From 3c2c87364b89de46d12e95abd5bdf8cbd2c6dbf6 Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期三, 12 三月 2025 08:43:23 +0800 Subject: [PATCH] dev-init --- ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java index 4b31343..9475398 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java +++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java @@ -1,5 +1,6 @@ package org.dromara.common.tenant.handle; +import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.constant.GlobalConstants; import org.dromara.common.core.utils.StringUtils; @@ -26,6 +27,9 @@ if (StringUtils.isBlank(name)) { return null; } + if (InterceptorIgnoreHelper.willIgnoreTenantLine("")) { + return super.map(name); + } if (StringUtils.contains(name, GlobalConstants.GLOBAL_REDIS_KEY)) { return super.map(name); } @@ -33,7 +37,7 @@ if (StringUtils.isBlank(tenantId)) { log.error("鏃犳硶鑾峰彇鏈夋晥鐨勭鎴穒d -> Null"); } - if (StringUtils.startsWith(name, tenantId)) { + if (StringUtils.startsWith(name, tenantId + "")) { // 濡傛灉瀛樺湪鍒欑洿鎺ヨ繑鍥� return super.map(name); } @@ -49,6 +53,9 @@ if (StringUtils.isBlank(unmap)) { return null; } + if (InterceptorIgnoreHelper.willIgnoreTenantLine("")) { + return super.unmap(name); + } if (StringUtils.contains(name, GlobalConstants.GLOBAL_REDIS_KEY)) { return super.unmap(name); } @@ -56,7 +63,7 @@ if (StringUtils.isBlank(tenantId)) { log.error("鏃犳硶鑾峰彇鏈夋晥鐨勭鎴穒d -> Null"); } - if (StringUtils.startsWith(unmap, tenantId)) { + if (StringUtils.startsWith(unmap, tenantId + "")) { // 濡傛灉瀛樺湪鍒欏垹闄� return unmap.substring((tenantId + ":").length()); } -- Gitblit v1.9.3