From 90970eb9fef42f1f02ea60c9522f4d7dd6a6c128 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 22 二月 2023 10:29:28 +0800
Subject: [PATCH] 修复isMatchedIp的参数判断产生空指针的问题
---
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
index 40a9732..8966cb4 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/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,7 +70,8 @@
public void setIsAsc(String isAsc)
{
- if (StringUtils.isNotEmpty(isAsc)) {
+ if (StringUtils.isNotEmpty(isAsc))
+ {
// 兼容前端排序类型
if ("ascending".equals(isAsc))
{
@@ -80,4 +84,18 @@
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.2