third_codes/mybatis-plus-join
1
0
Fork 0
mirror of https://gitee.com/best_handsome/mybatis-plus-join synced 2025-07-25 00:00:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

orderBy支持resultType字段

Browse Source
This commit is contained in:
yulichang 2024-05-18 00:53:25 +08:00
parent da15b11833
commit ad40b925da
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractLambdaWrapper.java
View File

@ -223,9 +223,9 @@ public abstract class JoinAbstractLambdaWrapper<T, Children extends JoinAbstract
@Override @Override
@SafeVarargs @SafeVarargs
protected final <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias,boolean orderBy, X... columns) { protected final <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, X... columns) {
return Arrays.stream(columns).map(i -> 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)); .collect(joining(StringPool.COMMA));
} }

4
mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractWrapper.java
View File

@ -479,7 +479,7 @@ public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrappe
return maybeDo(condition, () -> { return maybeDo(condition, () -> {
String one = columnToString(index, alias, column, false, isOn ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, false); String one = columnToString(index, alias, column, false, isOn ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, false);
if (ArrayUtils.isNotEmpty(columns)) { 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; final String finalOne = one;
appendSqlSegments(GROUP_BY, () -> finalOne); appendSqlSegments(GROUP_BY, () -> finalOne);
@ -890,7 +890,7 @@ public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrappe
* *
* @param columns 多字段 * @param columns 多字段
*/ */
abstract <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, boolean orderBy, X... columns); abstract <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, X... columns);
public <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, boolean orderBy, List<X> columns) { public <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, boolean orderBy, List<X> columns) {
return columns.stream().map(i -> return columns.stream().map(i ->