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;
     }