From cd34c87afa730c48e2b2be61d700b1fee409e02c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 12 七月 2021 11:00:12 +0800
Subject: [PATCH] fix 修复升级合并错误
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
index cf3f886..bb3d3e2 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
@@ -43,9 +43,9 @@
public static final int DEFAULT_PAGE_NUM = 1;
/**
- * 姣忛〉鏄剧ず璁板綍鏁� 榛樿鍊�
+ * 姣忛〉鏄剧ず璁板綍鏁� 榛樿鍊� 榛樿鏌ュ叏閮�
*/
- public static final int DEFAULT_PAGE_SIZE = 10;
+ public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE;
/**
* 鏋勫缓 plus 鍒嗛〉瀵硅薄
@@ -70,20 +70,31 @@
return page;
}
+ public static <T> Page<T> buildPage() {
+ return buildPage(null, null);
+ }
+
/**
* 鏋勫缓 MP 鏅�氬垎椤靛璞�
* @param <T> domain 瀹炰綋
* @return 鍒嗛〉瀵硅薄
*/
- public static <T> Page<T> buildPage() {
+ public static <T> Page<T> buildPage(String defaultOrderByColumn, String defaultIsAsc) {
Integer pageNum = ServletUtils.getParameterToInt(PAGE_NUM, DEFAULT_PAGE_NUM);
Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE, DEFAULT_PAGE_SIZE);
- String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN);
- String isAsc = ServletUtils.getParameter(IS_ASC);
+ String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN, defaultOrderByColumn);
+ String isAsc = ServletUtils.getParameter(IS_ASC, defaultIsAsc);
+ // 鍏煎鍓嶇鎺掑簭绫诲瀷
+ if ("ascending".equals(isAsc)) {
+ isAsc = "asc";
+ } else if ("descending".equals(isAsc)) {
+ isAsc = "desc";
+ }
Page<T> page = new Page<>(pageNum, pageSize);
if (StrUtil.isNotBlank(orderByColumn)) {
String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
- if ("asc".equals(isAsc)) {
+ orderBy = StrUtil.toUnderlineCase(orderBy);
+ if ("asc".equals(isAsc)) {
page.addOrder(OrderItem.asc(orderBy));
} else if ("desc".equals(isAsc)) {
page.addOrder(OrderItem.desc(orderBy));
--
Gitblit v1.9.3