diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableDefs.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableDefs.java
index ade0b9b1..afd73b75 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableDefs.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableDefs.java
@@ -53,7 +53,7 @@ public class TableDefs implements Serializable {
 
 
     public static TableDef getTableDef(Class<?> entityClass, String tableNameWithSchema) {
-        if (TABLE_DEF_MAP.isEmpty()) {
+        if (!TABLE_DEF_MAP.containsKey(tableNameWithSchema)) {
             init(entityClass.getPackage().getName());
         }
         return TABLE_DEF_MAP.get(tableNameWithSchema);
@@ -61,7 +61,7 @@ public class TableDefs implements Serializable {
 
 
     public static QueryColumn getQueryColumn(Class<?> entityClass, String tableNameWithSchema, String column) {
-        if (TABLE_DEF_MAP.isEmpty()) {
+        if (!TABLE_DEF_MAP.containsKey(tableNameWithSchema)) {
             init(entityClass.getPackage().getName());
         }
         Map<String, QueryColumn> queryColumnMap = QUERY_COLUMN_MAP.get(tableNameWithSchema);