|
@@ -198,7 +198,7 @@ public class MybatisPlusAutoConfiguration implements InitializingBean {
|
|
factory.setTypeEnumsPackage(this.properties.getTypeEnumsPackage());
|
|
factory.setTypeEnumsPackage(this.properties.getTypeEnumsPackage());
|
|
}
|
|
}
|
|
// TODO 此处必为非 NULL
|
|
// TODO 此处必为非 NULL
|
|
- GlobalConfig globalConfig = this.properties.getGlobalConfig();
|
|
|
|
|
|
+ GlobalConfig globalConfig = Optional.ofNullable(this.properties.getGlobalConfig()).orElse(factory.getConfiguration().getGlobalConfig());
|
|
// TODO 注入填充器
|
|
// TODO 注入填充器
|
|
if (this.applicationContext.getBeanNamesForType(MetaObjectHandler.class,
|
|
if (this.applicationContext.getBeanNamesForType(MetaObjectHandler.class,
|
|
false, false).length > 0) {
|
|
false, false).length > 0) {
|