فهرست منبع

修复存在 mapper.xml 情况下逻辑删除失效

miemie 6 سال پیش
والد
کامیت
c279360d54

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

@@ -92,12 +92,11 @@ public class GlobalConfig implements Serializable {
      * 标记全局设置 (统一所有入口)
      * </p>
      */
-    public SqlSessionFactory signGlobalConfig(SqlSessionFactory sqlSessionFactory) {
+    public void signGlobalConfig(SqlSessionFactory sqlSessionFactory) {
         if (null != sqlSessionFactory) {
             GlobalConfigUtils.setGlobalConfig(sqlSessionFactory.getConfiguration(), this);
         }
         this.sqlSessionFactory = sqlSessionFactory;
-        return sqlSessionFactory;
     }
 
     @Data

+ 7 - 6
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/spring/MybatisSqlSessionFactoryBean.java

@@ -604,6 +604,12 @@ public class MybatisSqlSessionFactoryBean implements FactoryBean<SqlSessionFacto
         }
         SqlSessionFactory sqlSessionFactory = this.sqlSessionFactoryBuilder.build(configuration);
 
+        // TODO SqlRunner
+        SqlHelper.FACTORY = sqlSessionFactory;
+
+        // TODO 设置全局参数属性 以及 缓存 sqlSessionFactory
+        globalConfig.signGlobalConfig(sqlSessionFactory);
+
         if (!isEmpty(this.mapperLocations)) {
             if (globalConfig.isRefresh()) {
                 //TODO 设置自动刷新配置 减少配置
@@ -635,12 +641,7 @@ public class MybatisSqlSessionFactoryBean implements FactoryBean<SqlSessionFacto
                 LOGGER.debug("Property 'mapperLocations' was not specified or no matching resources found");
             }
         }
-
-        // TODO SqlRunner
-        SqlHelper.FACTORY = sqlSessionFactory;
-
-        // TODO 设置全局参数属性 以及 缓存 sqlSessionFactory
-        return globalConfig.signGlobalConfig(sqlSessionFactory);
+        return sqlSessionFactory;
     }
 
     /**