From c65552da1666c2ddf62a258c750685b3293143c0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 23 九月 2024 17:05:14 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/BusinessSortService.java |    2 +-
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java |    4 ++--
 zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/BaseController.java |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/BusinessSortService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/BusinessSortService.java
index 399ba84..7c46860 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/BusinessSortService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/BusinessSortService.java
@@ -49,7 +49,7 @@
         }
     }
 
-    public String getSql(Class<? extends DataFieldSortFunc> cls, String fieldName) {
+    public String getOrderBySql(Class<? extends DataFieldSortFunc> cls, String fieldName) {
         String sql = map.get(cls);
         if (!Cools.isEmpty(sql)) {
             return "ORDER BY FIELD(" + fieldName + ", " + sql + ") ASC, create_time DESC";
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java
index 6a62262..579bd5d 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java
@@ -51,8 +51,8 @@
         BaseParam baseParam = buildParam(map, BaseParam.class);
         PageParam<Bus, BaseParam> pageParam = new PageParam<>(baseParam, Bus.class);
         QueryWrapper<Bus> wrapper = pageParam.buildWrapper(true);
-        if (createTimeDesc(pageParam.getOrders())) {
-            wrapper.last(businessSortService.getSql(BusStsType.class, "bus_sts"));
+        if (hasCreateTimeDesc(pageParam.getOrders())) {
+            wrapper.last(businessSortService.getOrderBySql(BusStsType.class, "bus_sts"));
         }
         PageParam<Bus, BaseParam> page = busService.page(pageParam, wrapper);
         for (Bus record : page.getRecords()) {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/BaseController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/BaseController.java
index 1849999..f6ca5bb 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/BaseController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/BaseController.java
@@ -51,7 +51,7 @@
         return t;
     }
 
-    public Boolean createTimeDesc(List<OrderItem> orderItems) {
+    public Boolean hasCreateTimeDesc(List<OrderItem> orderItems) {
         if (Cools.isEmpty(orderItems)) {
             return true;
         }

--
Gitblit v1.9.1