From 837c6cb01c9fff85419445e04143af4d98512ad0 Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Fri, 21 Jun 2024 16:11:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=86=8D=E6=AC=A1=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/domain/bo/SysOssTextbookBo.java    |  1 +
 .../impl/SysOssTextbookServiceImpl.java       | 44 +++++++++++--------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssTextbookBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssTextbookBo.java
index 8a34b24..13ddc64 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssTextbookBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssTextbookBo.java
@@ -49,6 +49,7 @@ public class SysOssTextbookBo extends BaseEntity {
     private Integer status;
 
     private String orderByColumn;
+    private String isAsc;
 
 
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java
index 8033d34..9ccec4b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java
@@ -109,24 +109,32 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService {
                 w.in("ot.catalog_id", ids);
             });
         String orderByColumn = bo.getOrderByColumn();
-        switch (orderByColumn) {
-            case "downloadDesc":
-                wrapper.orderByDesc("ot.download_num");
-                break;
-            case "downloadAsc":
-                wrapper.orderByAsc("ot.download_num");
-                break;
-            case "previewDesc":
-                wrapper.orderByDesc("ot.preview_num");
-                break;
-            case "previewAsc":
-                wrapper.orderByAsc("ot.preview_num");
-                break;
-            case "timeAsc":
-                wrapper.orderByAsc("ot.create_time");
-                break;
-            default:
-                wrapper.orderByDesc("ot.create_time");
+        if (StringUtils.isNotEmpty(orderByColumn)) {
+            String isAsc = bo.getIsAsc();
+            boolean orderFlag = "ascending".equals(isAsc) ? true : false;
+            switch (orderByColumn) {
+                case "downloadNum":
+                    if (orderFlag) {
+                        wrapper.orderByAsc("ot.download_num");
+                    } else {
+                        wrapper.orderByDesc("ot.download_num");
+                    }
+                    break;
+                case "previewNum":
+                    if (orderFlag) {
+                        wrapper.orderByAsc("ot.preview_num");
+                    } else {
+                        wrapper.orderByDesc("ot.preview_num");
+                    }
+                    break;
+                case "createTime":
+                    if (orderFlag) {
+                        wrapper.orderByAsc("ot.create_time");
+                    }
+                    break;
+                default:
+                    wrapper.orderByDesc("ot.create_time");
+            }
         }
         return wrapper;
     }