diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/DistinctQueryColumn.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/DistinctQueryColumn.java index f362d6dd..57802808 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/DistinctQueryColumn.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/DistinctQueryColumn.java @@ -33,18 +33,13 @@ public class DistinctQueryColumn extends QueryColumn implements HasParamsColumn this.queryColumns = CollectionUtil.newArrayList(queryColumns); } - @Override - public String toSelectSql(List queryTables, IDialect dialect) { - if (CollectionUtil.isEmpty(queryTables)) { - return SqlConsts.EMPTY; - } - - String sql = SqlConsts.DISTINCT + StringUtil.join(SqlConsts.DELIMITER, queryColumns, queryColumn -> - queryColumn.toSelectSql(queryTables, dialect)); - - return sql + WrapperUtil.buildColumnAlias(alias, dialect); + public List getQueryColumns() { + return queryColumns; } + public void setQueryColumns(List queryColumns) { + this.queryColumns = queryColumns; + } @Override String toConditionSql(List queryTables, IDialect dialect) { @@ -52,9 +47,26 @@ public class DistinctQueryColumn extends QueryColumn implements HasParamsColumn return SqlConsts.EMPTY; } - return SqlConsts.DISTINCT + StringUtil.join(SqlConsts.DELIMITER, queryColumns, queryColumn -> - queryColumn.toSelectSql(queryTables, dialect)); + return SqlConsts.DISTINCT + StringUtil.join( + SqlConsts.DELIMITER, + queryColumns, + queryColumn -> queryColumn.toSelectSql(queryTables, dialect) + ); + } + @Override + public String toSelectSql(List queryTables, IDialect dialect) { + if (CollectionUtil.isEmpty(queryTables)) { + return SqlConsts.EMPTY; + } + + String sql = SqlConsts.DISTINCT + StringUtil.join( + SqlConsts.DELIMITER, + queryColumns, + queryColumn -> queryColumn.toSelectSql(queryTables, dialect) + ); + + return sql + WrapperUtil.buildColumnAlias(alias, dialect); } @Override @@ -62,6 +74,7 @@ public class DistinctQueryColumn extends QueryColumn implements HasParamsColumn DistinctQueryColumn clone = (DistinctQueryColumn) super.clone(); // deep clone ... clone.queryColumns = CollectionUtil.cloneArrayList(this.queryColumns); + return clone; } @@ -76,6 +89,7 @@ public class DistinctQueryColumn extends QueryColumn implements HasParamsColumn for (QueryColumn queryColumn : queryColumns) { if (queryColumn instanceof HasParamsColumn) { Object[] paramValues = ((HasParamsColumn) queryColumn).getParamValues(); + params.addAll(Arrays.asList(paramValues)); } }