From 8fea54e226b7a9d706a448fba0bd84da3ddc4c78 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Thu, 15 Dec 2022 15:45:52 +0800
Subject: [PATCH] query

---
 .../org/nl/common/domain/query/PageQuery.java | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/PageQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/PageQuery.java
index 8938698..ecfacee 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/PageQuery.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/PageQuery.java
@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 
@@ -19,12 +20,12 @@ public class PageQuery implements Serializable {
     /**
      * 分页大小
      */
-    private Integer pageSize;
+    private Integer size;
 
     /**
      * 当前页数
      */
-    private Integer pageNum;
+    private Integer page;
 
     /**
      * 排序列
@@ -47,16 +48,21 @@ public class PageQuery implements Serializable {
     public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE;
 
     public <T> Page<T> build() {
-        Integer pageNum = ObjectUtil.defaultIfNull(getPageNum(), DEFAULT_PAGE_NUM);
-        Integer pageSize = ObjectUtil.defaultIfNull(getPageSize(), DEFAULT_PAGE_SIZE);
+        Integer pageNum = ObjectUtil.defaultIfNull(getPage(), DEFAULT_PAGE_NUM);
+        Integer pageSize = ObjectUtil.defaultIfNull(getSize(), DEFAULT_PAGE_SIZE);
         if (pageNum <= 0) {
             pageNum = DEFAULT_PAGE_NUM;
         }
         Page<T> page = new Page<>(pageNum, pageSize);
-        OrderItem item = new OrderItem();
-        item.setColumn(sort);
-        item.setAsc(isAsc);
-        page.addOrder(item);
+        if (StringUtils.isNotEmpty(sort)){
+            String[] split = sort.split(",");
+            for (String col : split) {
+                OrderItem item = new OrderItem();
+                item.setColumn(col);
+                item.setAsc(isAsc);
+                page.addOrder(item);
+            }
+        }
         return page;
     }
 }