From 80784433b8506f58463fc1f4a438c053b61b299e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 02 九月 2021 15:59:42 +0800
Subject: [PATCH] remove 移除分页合理化参数 使用 MP 全局配置分页溢出
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java | 22 ++++------------------
1 files changed, 4 insertions(+), 18 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 67cf72c..17a12f1 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
@@ -37,11 +37,6 @@
public static final String IS_ASC = "isAsc";
/**
- * 鍒嗛〉鍙傛暟鍚堢悊鍖�
- */
- private static final String REASONABLE = "reasonable";
-
- /**
* 褰撳墠璁板綍璧峰绱㈠紩 榛樿鍊�
*/
public static final int DEFAULT_PAGE_NUM = 1;
@@ -50,11 +45,6 @@
* 姣忛〉鏄剧ず璁板綍鏁� 榛樿鍊� 榛樿鏌ュ叏閮�
*/
public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE;
-
- /**
- * 鍒嗛〉鍙傛暟鍚堢悊鍖� 榛樿鍊�
- */
- private static final Boolean DEFAULT_REASONABLE = Boolean.TRUE;
/**
* 鏋勫缓 plus 鍒嗛〉瀵硅薄
@@ -67,10 +57,8 @@
Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE, DEFAULT_PAGE_SIZE);
String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN);
String isAsc = ServletUtils.getParameter(IS_ASC);
- Boolean reasonable = ServletUtils.getParameterToBool(REASONABLE, DEFAULT_REASONABLE);
- //鍒嗛〉鍚堢悊鍖栵紝閽堝涓嶅悎鐞嗙殑椤电爜鑷姩澶勭悊
- if (reasonable && pageNum <= 0) {
- pageNum = 1;
+ if (pageNum <= 0) {
+ pageNum = DEFAULT_PAGE_NUM;
}
PagePlus<T, K> page = new PagePlus<>(pageNum, pageSize);
if (StringUtils.isNotBlank(orderByColumn)) {
@@ -98,10 +86,8 @@
Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE, DEFAULT_PAGE_SIZE);
String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN, defaultOrderByColumn);
String isAsc = ServletUtils.getParameter(IS_ASC, defaultIsAsc);
- Boolean reasonable = ServletUtils.getParameterToBool(REASONABLE, DEFAULT_REASONABLE);
- //鍒嗛〉鍚堢悊鍖栵紝閽堝涓嶅悎鐞嗙殑椤电爜鑷姩澶勭悊
- if (reasonable && pageNum <= 0) {
- pageNum = 1;
+ if (pageNum <= 0) {
+ pageNum = DEFAULT_PAGE_NUM;
}
// 鍏煎鍓嶇鎺掑簭绫诲瀷
if ("ascending".equals(isAsc)) {
--
Gitblit v1.9.3