From 663024ac7fe2c1a60d151e4e645e5e0f553366a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Tue, 20 Sep 2022 10:46:43 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20pr235=20=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E5=B0=8F=E9=97=AE=E9=A2=98=E4=B8=8E=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/common/core/domain/PageQuery.java   | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java
index c073a94c8..60abde623 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java
@@ -1,5 +1,6 @@
 package com.ruoyi.common.core.domain;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -61,52 +62,51 @@ public class PageQuery implements Serializable {
         }
         Page<T> page = new Page<>(pageNum, pageSize);
         List<OrderItem> orderItems = buildOrderItem();
-        if (ObjectUtil.isNotNull(orderItems)) {
+        if (CollUtil.isNotEmpty(orderItems)) {
             page.addOrder(orderItems);
         }
         return page;
     }
 
+    /**
+     * 构建排序
+     *
+     * 支持的用法如下:
+     * {isAsc:"asc",orderByColumn:"id"} order by id asc
+     * {isAsc:"asc",orderByColumn:"id,createTime"} order by id asc,create_time asc
+     * {isAsc:"desc",orderByColumn:"id,createTime"} order by id desc,create_time desc
+     * {isAsc:"asc,desc",orderByColumn:"id,createTime"} order by id asc,create_time desc
+     */
     private List<OrderItem> buildOrderItem() {
-        if (StringUtils.isNotBlank(isAsc) && StringUtils.isNotBlank(orderByColumn)) {
-            // 兼容前端排序类型
-            isAsc = isAsc.replace("ascending", "asc")
-                .replace("descending", "desc");
+        if (StringUtils.isBlank(orderByColumn) || StringUtils.isBlank(isAsc)) {
+            return null;
+        }
+        String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
+        orderBy = StringUtils.toUnderScoreCase(orderBy);
 
-            String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
-            orderBy = StringUtils.toUnderScoreCase(orderBy);
-            //分割orderByColumn和isAsc参数
-            String[] orderByArr = orderBy.split(",");
-            String[] isAscArr = isAsc.split(",");
-            if (isAscArr.length != 1 && isAscArr.length != orderByArr.length) {
+        // 兼容前端排序类型
+        isAsc = StringUtils.replaceEach(isAsc, new String[]{"ascending", "descending"}, new String[]{"asc", "desc"});
+
+        String[] orderByArr = orderBy.split(",");
+        String[] isAscArr = isAsc.split(",");
+        if (isAscArr.length != 1 && isAscArr.length != orderByArr.length) {
+            throw new ServiceException("排序参数有误");
+        }
+
+        List<OrderItem> list = new ArrayList<>();
+        // 每个字段各自排序
+        for (int i = 0; i < orderByArr.length; i++) {
+            String orderByStr = orderByArr[i];
+            String isAscStr = isAscArr.length == 1 ? isAscArr[0] : isAscArr[i];
+            if ("asc".equals(isAscStr)) {
+                list.add(OrderItem.asc(orderByStr));
+            } else if ("desc".equals(isAscStr)) {
+                list.add(OrderItem.desc(orderByStr));
+            } else {
                 throw new ServiceException("排序参数有误");
             }
-            if (isAscArr.length == 1) {
-                //isAsc只提供了一个 则全部字段都是如此排序
-                if ("asc".equals(isAsc)) {
-                    return OrderItem.ascs(orderBy);
-                } else if ("desc".equals(isAsc)) {
-                    return OrderItem.descs(orderBy);
-                } else {
-                    throw new ServiceException("isAsc参数有误");
-                }
-            }
-            ArrayList<OrderItem> list = new ArrayList<>();
-            //每个字段各自排序
-            for (int i = 0; i < isAscArr.length; i++) {
-                String isAscStr = isAscArr[i];
-                String orderByStr = orderByArr[i];
-                if ("asc".equals(isAscStr)) {
-                    list.add(OrderItem.asc(orderByStr));
-                } else if ("desc".equals(isAscStr)) {
-                    list.add(OrderItem.desc(orderByStr));
-                } else {
-                    throw new ServiceException("isAsc参数有误");
-                }
-            }
-            return list;
         }
-        return null;
+        return list;
     }
 
 }