From 0226e329d4f617cd3cb6a71b94f7f69e82736216 Mon Sep 17 00:00:00 2001
From: Chuck1sn <chuck1inzl@gmail.com>
Date: Fri, 16 May 2025 15:49:13 +0800
Subject: [PATCH] fix order

---
 .../main/java/com/zl/mjga/dto/PageRequestDto.java | 15 ++++++++++-----
 .../com/zl/mjga/repository/QrtzJobRepository.java |  2 +-
 frontend/.env                                     |  8 ++++----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/com/zl/mjga/dto/PageRequestDto.java b/backend/src/main/java/com/zl/mjga/dto/PageRequestDto.java
index 6916ecd..ec78587 100644
--- a/backend/src/main/java/com/zl/mjga/dto/PageRequestDto.java
+++ b/backend/src/main/java/com/zl/mjga/dto/PageRequestDto.java
@@ -68,11 +68,16 @@ public class PageRequestDto {
   }
 
   public List<SortField<Object>> getSortFields() {
-    return sortBy.entrySet().stream()
-        .map(
-            (entry) ->
-                field(name(entry.getKey())).sort(SortOrder.valueOf(entry.getValue().getKeyword())))
-        .toList();
+    List<SortField<Object>> sortFields = sortBy.entrySet().stream()
+            .map(
+                    (entry) ->
+                            field(name(entry.getKey())).sort(SortOrder.valueOf(entry.getValue().getKeyword())))
+            .toList();
+    if (sortFields.isEmpty()) {
+      return List.of(field(name("id")).sort(SortOrder.ASC));
+    } else {
+      return sortFields;
+    }
   }
 
   private void checkPageAndSize(int page, int size) {
diff --git a/backend/src/main/java/com/zl/mjga/repository/QrtzJobRepository.java b/backend/src/main/java/com/zl/mjga/repository/QrtzJobRepository.java
index 9ad9ef6..bb61a52 100644
--- a/backend/src/main/java/com/zl/mjga/repository/QrtzJobRepository.java
+++ b/backend/src/main/java/com/zl/mjga/repository/QrtzJobRepository.java
@@ -38,7 +38,7 @@ public class QrtzJobRepository extends QrtzJobDetailsDao {
             StringUtils.isNotEmpty(queryDto.name())
                 ? QRTZ_JOB_DETAILS.SCHED_NAME.eq(queryDto.name())
                 : noCondition())
-        .orderBy(pageRequestDto.getSortFields())
+        .orderBy(QRTZ_JOB_DETAILS.qrtzTriggers().TRIGGER_NAME)
         .limit(pageRequestDto.getSize())
         .offset(pageRequestDto.getOffset())
         .fetch();
diff --git a/frontend/.env b/frontend/.env
index cbc4b2d..bd687de 100644
--- a/frontend/.env
+++ b/frontend/.env
@@ -1,11 +1,11 @@
 VITE_APP_PORT=5173
 VITE_SOURCE_MAP=true
 # mock
-VITE_ENABLE_MOCK=true
-VITE_BASE_URL=http://localhost:5173
+#VITE_ENABLE_MOCK=true
+#VITE_BASE_URL=http://localhost:5173
 # local
-#VITE_ENABLE_MOCK=false
-#VITE_BASE_URL=http://localhost:8080
+VITE_ENABLE_MOCK=false
+VITE_BASE_URL=http://localhost:8080
 # dev
 #VITE_ENABLE_MOCK=false
 #VITE_BASE_URL=https://localhost/api