From 81cefdca83b5b5d0ff318b8139fe86154d3d27d4 Mon Sep 17 00:00:00 2001
From: ZhouXY108 <luquanlion@outlook.com>
Date: Wed, 6 Dec 2023 18:13:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F=E7=9A=84?=
 =?UTF-8?q?=20bug=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhouxy/plusone/AccountQueriesTests.java   | 33 +++++++++++++++++++
 .../application/query/AccountQueries.xml      | 11 ++++---
 2 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 plusone-start/src/test/java/xyz/zhouxy/plusone/AccountQueriesTests.java

diff --git a/plusone-start/src/test/java/xyz/zhouxy/plusone/AccountQueriesTests.java b/plusone-start/src/test/java/xyz/zhouxy/plusone/AccountQueriesTests.java
new file mode 100644
index 0000000..7cb5b94
--- /dev/null
+++ b/plusone-start/src/test/java/xyz/zhouxy/plusone/AccountQueriesTests.java
@@ -0,0 +1,33 @@
+package xyz.zhouxy.plusone;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import lombok.extern.slf4j.Slf4j;
+import xyz.zhouxy.plusone.system.application.query.AccountQueries;
+import xyz.zhouxy.plusone.system.application.query.params.AccountQueryParams;
+import xyz.zhouxy.plusone.system.application.query.result.AccountOverview;
+
+@Slf4j
+@SpringBootTest(classes = PlusoneApplication.class)
+class AccountQueriesTests {
+
+    @Resource
+    AccountQueries accountQueries;
+
+    @Test
+    void testQueryPage() {
+        AccountQueryParams queryParams = new AccountQueryParams();
+        // queryParams.setOrderBy(List.of("email", "mobile_phone", "id"));
+        queryParams.setSize(20);
+        queryParams.setPageNum(1L);
+        queryParams.setOrderBy(Collections.emptyList());
+        List<AccountOverview> l = accountQueries.queryAccountOverview(queryParams);
+        log.info("l: {}", l);
+    }
+}
diff --git a/plusone-system/plusone-system-application/src/main/resources/xyz/zhouxy/plusone/system/application/query/AccountQueries.xml b/plusone-system/plusone-system-application/src/main/resources/xyz/zhouxy/plusone/system/application/query/AccountQueries.xml
index 20bf6b4..e384ddf 100644
--- a/plusone-system/plusone-system-application/src/main/resources/xyz/zhouxy/plusone/system/application/query/AccountQueries.xml
+++ b/plusone-system/plusone-system-application/src/main/resources/xyz/zhouxy/plusone/system/application/query/AccountQueries.xml
@@ -87,10 +87,13 @@
                     AND sar.role_id = #{roleId}
                     AND sr.deleted = 0
                 </if>
-                <if test="orderBy != null">
-                    ORDER BY sa.${orderBy}, sa.id
+                <if test="orderBy != null and !orderBy.isEmpty()">
+                    ORDER BY
+                    <foreach item="col" index="index" collection="orderBy" open="" separator="," close="">
+                        sa.${col}
+                    </foreach>
                 </if>
-                <if test="orderBy == null">
+                <if test="orderBy == null or orderBy.isEmpty()">
                     ORDER BY sa.id
                 </if>
                 LIMIT #{size} OFFSET #{offset}
@@ -99,7 +102,7 @@
     </select>
 
     <!--
-        long count(SysAccountQuery queryParams);
+        long count(AccountQueryParams queryParams);
     -->
     <select id="count" resultType="long">
         SELECT COUNT(*)