From 693a33f660891c98b8b95490d020c428c5da9871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=8A=93=E8=9B=99=E5=B8=88?= <770492966@qq.com>
Date: Mon, 19 Sep 2022 21:46:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD=EF=BC=9A?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=8F=AF=E4=BB=A5=E9=85=8D=E7=BD=AE=E5=A4=9A?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=8F=82=E6=95=B0=E6=94=AF=E6=8C=81=E4=BE=9D?=
 =?UTF-8?q?=E6=AC=A1=E6=8E=92=E5=BA=8F=20=E5=A6=82=EF=BC=9A{isAsc:"asc",or?=
 =?UTF-8?q?derByColumn:"id"}=20{isAsc:"asc",orderByColumn:"id,createTime"}?=
 =?UTF-8?q?=20{isAsc:"asc,desc",orderByColumn:"id,createTime"}=20=E5=85=B1?=
 =?UTF-8?q?=E4=B8=89=E7=A7=8D=E9=85=8D=E7=BD=AE=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/common/core/domain/PageQuery.java   | 56 ++++++++++++++-----
 1 file changed, 41 insertions(+), 15 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 f3e2c4a56..c073a94c8 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
@@ -3,11 +3,14 @@ package com.ruoyi.common.core.domain;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.sql.SqlUtil;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 分页查询实体类
@@ -57,28 +60,51 @@ public class PageQuery implements Serializable {
             pageNum = DEFAULT_PAGE_NUM;
         }
         Page<T> page = new Page<>(pageNum, pageSize);
-        OrderItem orderItem = buildOrderItem();
-        if (ObjectUtil.isNotNull(orderItem)) {
-            page.addOrder(orderItem);
+        List<OrderItem> orderItems = buildOrderItem();
+        if (ObjectUtil.isNotNull(orderItems)) {
+            page.addOrder(orderItems);
         }
         return page;
     }
 
-    private OrderItem buildOrderItem() {
-        // 兼容前端排序类型
-        if ("ascending".equals(isAsc)) {
-            isAsc = "asc";
-        } else if ("descending".equals(isAsc)) {
-            isAsc = "desc";
-        }
-        if (StringUtils.isNotBlank(orderByColumn)) {
+    private List<OrderItem> buildOrderItem() {
+        if (StringUtils.isNotBlank(isAsc) && StringUtils.isNotBlank(orderByColumn)) {
+            // 兼容前端排序类型
+            isAsc = isAsc.replace("ascending", "asc")
+                .replace("descending", "desc");
+
             String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
             orderBy = StringUtils.toUnderScoreCase(orderBy);
-            if ("asc".equals(isAsc)) {
-                return OrderItem.asc(orderBy);
-            } else if ("desc".equals(isAsc)) {
-                return OrderItem.desc(orderBy);
+            //分割orderByColumn和isAsc参数
+            String[] orderByArr = orderBy.split(",");
+            String[] isAscArr = isAsc.split(",");
+            if (isAscArr.length != 1 && isAscArr.length != orderByArr.length) {
+                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;
     }