From d7b0dc91d5d8ee66eb710286b7f47d26564aa55d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 11 十二月 2024 18:12:31 +0800
Subject: [PATCH] update 优化 去除部门查询状态校验 改为前端过滤 便于查看禁用部门下的其他数据
---
ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 9475398..fbf210d 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
@@ -27,15 +27,20 @@
if (StringUtils.isBlank(name)) {
return null;
}
- if (InterceptorIgnoreHelper.willIgnoreTenantLine("")) {
- return super.map(name);
+ try {
+ if (InterceptorIgnoreHelper.willIgnoreTenantLine("")) {
+ return super.map(name);
+ }
+ } catch (NoClassDefFoundError ignore) {
+ // 鏈変簺鏈嶅姟涓嶉渶瑕乵p瀵艰嚧绫讳笉瀛樺湪 蹇界暐鍗冲彲
}
if (StringUtils.contains(name, GlobalConstants.GLOBAL_REDIS_KEY)) {
return super.map(name);
}
String tenantId = TenantHelper.getTenantId();
if (StringUtils.isBlank(tenantId)) {
- log.error("鏃犳硶鑾峰彇鏈夋晥鐨勭鎴穒d -> Null");
+ log.debug("鏃犳硶鑾峰彇鏈夋晥鐨勭鎴穒d -> Null");
+ return super.map(name);
}
if (StringUtils.startsWith(name, tenantId + "")) {
// 濡傛灉瀛樺湪鍒欑洿鎺ヨ繑鍥�
@@ -53,15 +58,20 @@
if (StringUtils.isBlank(unmap)) {
return null;
}
- if (InterceptorIgnoreHelper.willIgnoreTenantLine("")) {
- return super.unmap(name);
+ try {
+ if (InterceptorIgnoreHelper.willIgnoreTenantLine("")) {
+ return super.unmap(name);
+ }
+ } catch (NoClassDefFoundError ignore) {
+ // 鏈変簺鏈嶅姟涓嶉渶瑕乵p瀵艰嚧绫讳笉瀛樺湪 蹇界暐鍗冲彲
}
if (StringUtils.contains(name, GlobalConstants.GLOBAL_REDIS_KEY)) {
return super.unmap(name);
}
String tenantId = TenantHelper.getTenantId();
if (StringUtils.isBlank(tenantId)) {
- log.error("鏃犳硶鑾峰彇鏈夋晥鐨勭鎴穒d -> Null");
+ log.debug("鏃犳硶鑾峰彇鏈夋晥鐨勭鎴穒d -> Null");
+ return super.unmap(name);
}
if (StringUtils.startsWith(unmap, tenantId + "")) {
// 濡傛灉瀛樺湪鍒欏垹闄�
--
Gitblit v1.9.3