From 266d71293f3f90b95f0c01cd6aaa6a8394af9a0c Mon Sep 17 00:00:00 2001 From: yulichang <570810310@qq.com> Date: Sun, 16 Jun 2024 20:18:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20selectSub=E9=85=8D=E7=BD=AE=E6=97=A0?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autoconfigure/MybatisPlusJoinAutoConfiguration.java | 3 ++- .../yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java index fc68082..a7c4c3c 100644 --- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java +++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java @@ -65,11 +65,12 @@ public class MybatisPlusJoinAutoConfiguration { ObjectProvider IfExistsConsumers) { this.properties = Optional.ofNullable(propertiesConsumers.getIfAvailable()).map(c -> c.config(properties)).orElse(properties); ConfigProperties.banner = this.properties.getBanner(); - ConfigProperties.subTableLogic = this.properties.getSubTableLogic(); ConfigProperties.msCache = this.properties.isMsCache(); ConfigProperties.tableAlias = this.properties.getTableAlias(); ConfigProperties.joinPrefix = this.properties.getJoinPrefix(); ConfigProperties.logicDelType = this.properties.getLogicDelType(); + ConfigProperties.subQueryAlias = this.properties.getSubQueryAlias(); + ConfigProperties.subTableLogic = this.properties.getSubTableLogic(); ConfigProperties.mappingMaxCount = this.properties.getMappingMaxCount(); ConfigProperties.ifExists = Optional.ofNullable(IfExistsConsumers.getIfAvailable()) .map(m -> (BiPredicate) m) 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 38b46a4..4da0704 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 @@ -51,13 +51,14 @@ public class XPluginImpl implements Plugin { // 读取配置 Prop prop = new Prop(context.cfg()); ConfigProperties.banner = prop.get("banner", Boolean::parseBoolean); - ConfigProperties.subTableLogic = prop.get("subTableLogic", Boolean::parseBoolean); ConfigProperties.msCache = prop.get("msCache", Boolean::parseBoolean); ConfigProperties.tableAlias = prop.get("tableAlias", Function.identity()); ConfigProperties.joinPrefix = prop.get("joinPrefix", Function.identity()); ConfigProperties.logicDelType = prop.get("logicDelType", val -> // fix on/off yes/no 会转为Boolean LogicDelTypeEnum.WHERE.name().equalsIgnoreCase(val) ? LogicDelTypeEnum.WHERE : LogicDelTypeEnum.ON); + ConfigProperties.subTableLogic = prop.get("subTableLogic", Boolean::parseBoolean); + ConfigProperties.subQueryAlias = prop.get("subQueryAlias", Function.identity()); ConfigProperties.mappingMaxCount = prop.get("mappingMaxCount", Integer::parseInt); ConfigProperties.ifExists = prop.get("ifExists", val -> Arrays.stream(IfExistsEnum.values()).filter(e -> e.name().equalsIgnoreCase(val)).findFirst()