diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractLambdaWrapper.java index 6253bfb..1902277 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractLambdaWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractLambdaWrapper.java @@ -223,9 +223,9 @@ public abstract class JoinAbstractLambdaWrapper String columnsToString(Integer index, PrefixEnum prefixEnum, String alias,boolean orderBy, X... columns) { + protected final String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, X... columns) { return Arrays.stream(columns).map(i -> - columnToString(index, alias, (SFunction) i, false, prefixEnum, orderBy)) + columnToString(index, alias, (SFunction) i, false, prefixEnum, false)) .collect(joining(StringPool.COMMA)); } diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractWrapper.java index 7e1ace6..9387de6 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractWrapper.java @@ -479,7 +479,7 @@ public abstract class JoinAbstractWrapper { String one = columnToString(index, alias, column, false, isOn ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, false); if (ArrayUtils.isNotEmpty(columns)) { - one += (StringPool.COMMA + columnsToString(index, isOn ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, alias, false, columns)); + one += (StringPool.COMMA + columnsToString(index, isOn ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, alias, columns)); } final String finalOne = one; appendSqlSegments(GROUP_BY, () -> finalOne); @@ -890,7 +890,7 @@ public abstract class JoinAbstractWrapper String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, boolean orderBy, X... columns); + abstract String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, X... columns); public String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, boolean orderBy, List columns) { return columns.stream().map(i ->