From e90df394e0cb178b16d5f917730d8595a751dd20 Mon Sep 17 00:00:00 2001
From: oc <oc@yi.team>
Date: Wed, 13 Mar 2024 19:41:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20gitee=20issues/I988A6=20=E4=B8=BA=20Dis?=
 =?UTF-8?q?tinctQueryColumn=20=E7=9A=84=20queryColumns=20=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E6=B7=BB=E5=8A=A0=20getter=20=E5=92=8C=20setter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/query/DistinctQueryColumn.java       | 38 +++++++++++++------
 1 file changed, 26 insertions(+), 12 deletions(-)

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<QueryTable> 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<QueryColumn> getQueryColumns() {
+        return queryColumns;
     }
 
+    public void setQueryColumns(List<QueryColumn> queryColumns) {
+        this.queryColumns = queryColumns;
+    }
 
     @Override
     String toConditionSql(List<QueryTable> 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<QueryTable> 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));
             }
         }