From c94e9f0a1fbafb8e95f055a26a376892fe89a84c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 15 八月 2023 11:33:21 +0800
Subject: [PATCH] 升级commons.io到最新版本2.13.0
---
src/main/java/com/ruoyi/framework/web/page/PageDomain.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/web/page/PageDomain.java b/src/main/java/com/ruoyi/framework/web/page/PageDomain.java
index 7e50472..af24e6a 100644
--- a/src/main/java/com/ruoyi/framework/web/page/PageDomain.java
+++ b/src/main/java/com/ruoyi/framework/web/page/PageDomain.java
@@ -11,12 +11,18 @@
{
/** 褰撳墠璁板綍璧峰绱㈠紩 */
private Integer pageNum;
+
/** 姣忛〉鏄剧ず璁板綍鏁� */
private Integer pageSize;
+
/** 鎺掑簭鍒� */
private String orderByColumn;
- /** 鎺掑簭鐨勬柟鍚� "desc" 鎴栬�� "asc". */
- private String isAsc;
+
+ /** 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc */
+ private String isAsc = "asc";
+
+ /** 鍒嗛〉鍙傛暟鍚堢悊鍖� */
+ private Boolean reasonable = true;
public String getOrderBy()
{
@@ -64,6 +70,32 @@
public void setIsAsc(String isAsc)
{
- this.isAsc = isAsc;
+ if (StringUtils.isNotEmpty(isAsc))
+ {
+ // 鍏煎鍓嶇鎺掑簭绫诲瀷
+ if ("ascending".equals(isAsc))
+ {
+ isAsc = "asc";
+ }
+ else if ("descending".equals(isAsc))
+ {
+ isAsc = "desc";
+ }
+ this.isAsc = isAsc;
+ }
+ }
+
+ public Boolean getReasonable()
+ {
+ if (StringUtils.isNull(reasonable))
+ {
+ return Boolean.TRUE;
+ }
+ return reasonable;
+ }
+
+ public void setReasonable(Boolean reasonable)
+ {
+ this.reasonable = reasonable;
}
}
--
Gitblit v1.9.3