From c7ea5485fdc3a282a8af5ec7d561beb666caf3ac Mon Sep 17 00:00:00 2001 From: yulichang <570810310@qq.com> Date: Wed, 17 Jan 2024 14:12:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mybatis-plus-join-solon-plugin/pom.xml | 2 +- .../mybatisplusjoin/solon/plugin/XPluginImpl.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mybatis-plus-join-solon-plugin/pom.xml b/mybatis-plus-join-solon-plugin/pom.xml index b27d424..4fd0e8c 100644 --- a/mybatis-plus-join-solon-plugin/pom.xml +++ b/mybatis-plus-join-solon-plugin/pom.xml @@ -12,7 +12,7 @@ mybatis-plus-join-solon-plugin - 2.6.3 + 2.6.4 8 8 UTF-8 diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java index 7db2be8..b7bcf07 100644 --- a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java +++ b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java @@ -3,13 +3,13 @@ package com.github.yulichang.mybatisplusjoin.solon.plugin; import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils; import com.github.yulichang.config.ConfigProperties; import com.github.yulichang.config.MPJInterceptorConfig; -import com.github.yulichang.config.enums.IfPresentEnum; +import com.github.yulichang.config.enums.IfExistsEnum; import com.github.yulichang.config.enums.LogicDelTypeEnum; import com.github.yulichang.extension.mapping.config.MappingConfig; import com.github.yulichang.injector.MPJSqlInjector; import com.github.yulichang.toolkit.SpringContentUtils; import com.github.yulichang.toolkit.reflect.GenericTypeUtils; -import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum; +import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum; import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.solon.MybatisAdapter; import org.apache.ibatis.solon.integration.MybatisAdapterManager; @@ -59,10 +59,10 @@ public class XPluginImpl implements Plugin { Arrays.stream(LogicDelTypeEnum.values()).filter(e -> e.name().equalsIgnoreCase(val)).findFirst() .orElseThrow(() -> ExceptionUtils.mpe("mybatis-plus-join.logicDelType 配置错误"))); ConfigProperties.mappingMaxCount = prop.get("mappingMaxCount", Integer::parseInt); - ConfigProperties.ifPresent = prop.get("ifPresent", val -> - Arrays.stream(IfPresentEnum.values()).filter(e -> e.name().equalsIgnoreCase(val)).findFirst() - .map(m -> (BiPredicate) (o, enums) -> m.test(o)) - .orElseThrow(() -> ExceptionUtils.mpe("mybatis-plus-join.ifPresent 配置错误"))); + ConfigProperties.ifExists = prop.get("ifExists", val -> + Arrays.stream(IfExistsEnum.values()).filter(e -> e.name().equalsIgnoreCase(val)).findFirst() + .map(m -> (BiPredicate) (o, enums) -> m.test(o)) + .orElseThrow(() -> ExceptionUtils.mpe("mybatis-plus-join.ifExists 配置错误"))); // 后续操作 context.onEvent(AppLoadEndEvent.class, e -> { List sqlSessionFactoryList = MybatisAdapterManager.getAll().values().stream()