miemie 2 سال پیش
والد
کامیت
bccdb746a1

+ 2 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/config/GlobalConfig.java

@@ -79,7 +79,8 @@ public class GlobalConfig implements Serializable {
     /**
     /**
      * 参与 TableInfo 的初始化
      * 参与 TableInfo 的初始化
      */
      */
-    private JoinTableInfoInitHandler joinTableInfoInitHandler;
+    private JoinTableInfoInitHandler joinTableInfoInitHandler = new JoinTableInfoInitHandler() {
+    };
     /**
     /**
      * 主键生成器
      * 主键生成器
      */
      */

+ 3 - 9
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/TableInfoHelper.java

@@ -179,9 +179,7 @@ public class TableInfoHelper {
         /* 自动构建 resultMap */
         /* 自动构建 resultMap */
         tableInfo.initResultMapIfNeed();
         tableInfo.initResultMapIfNeed();
         JoinTableInfoInitHandler joinTableInfoInitHandler = globalConfig.getJoinTableInfoInitHandler();
         JoinTableInfoInitHandler joinTableInfoInitHandler = globalConfig.getJoinTableInfoInitHandler();
-        if (joinTableInfoInitHandler != null) {
-            joinTableInfoInitHandler.joinTableInfo(tableInfo, configuration);
-        }
+        joinTableInfoInitHandler.joinTableInfo(tableInfo, configuration);
         TABLE_INFO_CACHE.put(clazz, tableInfo);
         TABLE_INFO_CACHE.put(clazz, tableInfo);
         TABLE_NAME_INFO_CACHE.put(tableInfo.getTableName(), tableInfo);
         TABLE_NAME_INFO_CACHE.put(tableInfo.getTableName(), tableInfo);
 
 
@@ -332,19 +330,15 @@ public class TableInfoHelper {
             /* 有 @TableField 注解的字段初始化 */
             /* 有 @TableField 注解的字段初始化 */
             if (tableField != null) {
             if (tableField != null) {
                 TableFieldInfo tableFieldInfo = new TableFieldInfo(dbConfig, tableInfo, field, tableField, reflector, existTableLogic, isOrderBy);
                 TableFieldInfo tableFieldInfo = new TableFieldInfo(dbConfig, tableInfo, field, tableField, reflector, existTableLogic, isOrderBy);
-                if (initTableInfoHandler != null) {
-                    initTableInfoHandler.joinTableFieldInfo(tableFieldInfo, configuration);
-                }
                 fieldList.add(tableFieldInfo);
                 fieldList.add(tableFieldInfo);
+                initTableInfoHandler.joinTableFieldInfo(tableFieldInfo, configuration);
                 continue;
                 continue;
             }
             }
 
 
             /* 无 @TableField  注解的字段初始化 */
             /* 无 @TableField  注解的字段初始化 */
             TableFieldInfo tableFieldInfo = new TableFieldInfo(dbConfig, tableInfo, field, reflector, existTableLogic, isOrderBy);
             TableFieldInfo tableFieldInfo = new TableFieldInfo(dbConfig, tableInfo, field, reflector, existTableLogic, isOrderBy);
-            if (initTableInfoHandler != null) {
-                initTableInfoHandler.joinTableFieldInfo(tableFieldInfo, configuration);
-            }
             fieldList.add(tableFieldInfo);
             fieldList.add(tableFieldInfo);
+            initTableInfoHandler.joinTableFieldInfo(tableFieldInfo, configuration);
         }
         }
 
 
         /* 字段列表 */
         /* 字段列表 */