From acf8d9719fe55260ee5ae2ccff3b1b4732bcbf72 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 01 Nov 2021 15:45:10 +0800
Subject: [PATCH] 修复字符串无法被反转义问题
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
index e681c67..413aabf 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
@@ -21,6 +21,9 @@
/** 排序的方向desc或者asc */
private String isAsc = "asc";
+ /** 分页参数合理化 */
+ private Boolean reasonable = true;
+
public String getOrderBy()
{
if (StringUtils.isEmpty(orderByColumn))
@@ -67,15 +70,32 @@
public void setIsAsc(String isAsc)
{
- // 兼容前端排序类型
- if ("ascending".equals(isAsc))
+ if (StringUtils.isNotEmpty(isAsc))
{
- isAsc = "asc";
+ // 兼容前端排序类型
+ if ("ascending".equals(isAsc))
+ {
+ isAsc = "asc";
+ }
+ else if ("descending".equals(isAsc))
+ {
+ isAsc = "desc";
+ }
+ this.isAsc = isAsc;
}
- else if ("descending".equals(isAsc))
+ }
+
+ public Boolean getReasonable()
+ {
+ if (StringUtils.isNull(reasonable))
{
- isAsc = "desc";
+ return Boolean.TRUE;
}
- this.isAsc = isAsc;
+ return reasonable;
+ }
+
+ public void setReasonable(Boolean reasonable)
+ {
+ this.reasonable = reasonable;
}
}
--
Gitblit v1.9.3