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()