From 00f9cdbe9b8908205c864a7956cd9f1aa58a85bd Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 07 五月 2025 17:44:27 +0800
Subject: [PATCH] 全局查询添加租户
---
src/main/java/com/ruoyi/common/handler/CustomTenantLineHandler.java | 9 +++++++--
src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java | 8 ++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java b/src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java
index 54e3c63..2b6a8b1 100644
--- a/src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java
+++ b/src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java
@@ -14,5 +14,13 @@
IGNORE_TABLES.add("sys_config");
IGNORE_TABLES.add("sys_user");
IGNORE_TABLES.add("sys_dept");
+ IGNORE_TABLES.add("sys_job");
+ IGNORE_TABLES.add("sys_dict_data");
+ IGNORE_TABLES.add("sys_dict_type");
+ IGNORE_TABLES.add("sys_user_role");
+ IGNORE_TABLES.add("sys_role");
+ IGNORE_TABLES.add("sys_role_menu");
+ IGNORE_TABLES.add("sys_menu");
+ IGNORE_TABLES.add("sys_role_dept");
}
}
diff --git a/src/main/java/com/ruoyi/common/handler/CustomTenantLineHandler.java b/src/main/java/com/ruoyi/common/handler/CustomTenantLineHandler.java
index d8b2b69..031f614 100644
--- a/src/main/java/com/ruoyi/common/handler/CustomTenantLineHandler.java
+++ b/src/main/java/com/ruoyi/common/handler/CustomTenantLineHandler.java
@@ -9,6 +9,7 @@
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
import java.util.Set;
@@ -17,8 +18,12 @@
@Override
public Expression getTenantId() {
- Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
- return new LongValue(tenantId);
+ try {
+ Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+ return new LongValue(tenantId);
+ } catch (Exception e) {
+ return null;
+ }
}
@Override
--
Gitblit v1.9.3