From cd993b01d55f9e56645f8f87e7c5207ced667275 Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Mon, 18 Mar 2024 14:44:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=AF=E4=BB=A5=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E8=A1=A8=E5=90=8D=E8=BF=94=E5=9B=9E=E5=A4=9A=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E3=80=82https://gitee.com/mybatis-flex/mybat?=
 =?UTF-8?q?is-flex/issues/I91Z61?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mybatisflex/core/table/TableInfo.java    |  4 ++--
 .../com/mybatisflex/core/tenant/TenantFactory.java    |  8 ++++++++
 .../com/mybatisflex/core/tenant/TenantManager.java    | 11 +++++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java
index 4979bab7..74663573 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java
@@ -798,7 +798,7 @@ public class TableInfo {
             return null;
         }
 
-        return TenantManager.getTenantIds();
+        return TenantManager.getTenantIds(tableName);
     }
 
 
@@ -1342,7 +1342,7 @@ public class TableInfo {
         }
 
         MetaObject metaObject = EntityMetaObject.forObject(entityObject, reflectorFactory);
-        Object[] tenantIds = TenantManager.getTenantIds();
+        Object[] tenantIds = TenantManager.getTenantIds(tableName);
         if (tenantIds == null || tenantIds.length == 0) {
             return;
         }
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/tenant/TenantFactory.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/tenant/TenantFactory.java
index a72d2091..3d8cea69 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/tenant/TenantFactory.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/tenant/TenantFactory.java
@@ -17,6 +17,14 @@ package com.mybatisflex.core.tenant;
 
 public interface TenantFactory {
 
+    /**
+     * @deprecated 使用 {@link #getTenantIds(String)} 代替。
+     */
+    @Deprecated
     Object[] getTenantIds();
 
+    default Object[] getTenantIds(String tableName) {
+        return getTenantIds();
+    }
+
 }
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/tenant/TenantManager.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/tenant/TenantManager.java
index 6ae07d9c..3e3a74a2 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/tenant/TenantManager.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/tenant/TenantManager.java
@@ -74,13 +74,20 @@ public class TenantManager {
         ignoreFlags.remove();
     }
 
-
+    /**
+     * @deprecated 使用 {@link #getTenantIds(String)} 代替。
+     */
+    @Deprecated
     public static Object[] getTenantIds() {
+        return getTenantIds(null);
+    }
+
+    public static Object[] getTenantIds(String tableName) {
         Boolean ignoreFlag = ignoreFlags.get();
         if (ignoreFlag != null && ignoreFlag) {
             return null;
         }
-        return tenantFactory != null ? tenantFactory.getTenantIds() : null;
+        return tenantFactory != null ? tenantFactory.getTenantIds(tableName) : null;
     }