From a15bfdfb46cd949c20080ab82fa74ab57bd1955d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 02 九月 2021 10:55:10 +0800
Subject: [PATCH] 防止表格最后页最后项删除变成暂无数据
---
ruoyi-ui/src/views/system/dict/data.vue | 1 -
ruoyi-ui/src/views/monitor/job/log.vue | 1 -
ruoyi-ui/src/views/tool/gen/index.vue | 1 -
ruoyi-ui/src/views/system/role/authUser.vue | 1 -
ruoyi-ui/src/views/system/notice/index.vue | 1 -
ruoyi-ui/src/views/system/role/index.vue | 1 -
ruoyi-ui/src/views/system/user/index.vue | 1 -
ruoyi-ui/src/views/monitor/job/index.vue | 1 -
ruoyi-ui/src/views/system/config/index.vue | 1 -
ruoyi-ui/src/views/system/dict/index.vue | 1 -
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java | 6 +++++-
ruoyi-ui/src/views/monitor/logininfor/index.vue | 1 -
ruoyi-ui/src/views/system/post/index.vue | 1 -
13 files changed, 5 insertions(+), 13 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 e98fa41..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
@@ -22,7 +22,7 @@
private String isAsc = "asc";
/** 分页参数合理化 */
- private Boolean reasonable = false;
+ private Boolean reasonable = true;
public String getOrderBy()
{
@@ -87,6 +87,10 @@
public Boolean getReasonable()
{
+ if (StringUtils.isNull(reasonable))
+ {
+ return Boolean.TRUE;
+ }
return reasonable;
}
diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue
index c421097..6146633 100644
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@@ -320,7 +320,6 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- reasonable: true,
jobName: undefined,
jobGroup: undefined,
status: undefined
diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue
index 64216f3..b55b011 100644
--- a/ruoyi-ui/src/views/monitor/job/log.vue
+++ b/ruoyi-ui/src/views/monitor/job/log.vue
@@ -220,7 +220,6 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- reasonable: true,
jobName: undefined,
jobGroup: undefined,
status: undefined
diff --git a/ruoyi-ui/src/views/monitor/logininfor/index.vue b/ruoyi-ui/src/views/monitor/logininfor/index.vue
index 14921e5..59df72c 100644
--- a/ruoyi-ui/src/views/monitor/logininfor/index.vue
+++ b/ruoyi-ui/src/views/monitor/logininfor/index.vue
@@ -153,7 +153,6 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- reasonable: true,
ipaddr: undefined,
userName: undefined,
status: undefined
diff --git a/ruoyi-ui/src/views/system/config/index.vue b/ruoyi-ui/src/views/system/config/index.vue
index f8b940c..b8472a8 100644
--- a/ruoyi-ui/src/views/system/config/index.vue
+++ b/ruoyi-ui/src/views/system/config/index.vue
@@ -219,7 +219,6 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- reasonable: true,
configName: undefined,
configKey: undefined,
configType: undefined
diff --git a/ruoyi-ui/src/views/system/dict/data.vue b/ruoyi-ui/src/views/system/dict/data.vue
index f1ba191..aa3849a 100644
--- a/ruoyi-ui/src/views/system/dict/data.vue
+++ b/ruoyi-ui/src/views/system/dict/data.vue
@@ -247,7 +247,6 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- reasonable: true,
dictName: undefined,
dictType: undefined,
status: undefined
diff --git a/ruoyi-ui/src/views/system/dict/index.vue b/ruoyi-ui/src/views/system/dict/index.vue
index 97c8100..20cf5ce 100644
--- a/ruoyi-ui/src/views/system/dict/index.vue
+++ b/ruoyi-ui/src/views/system/dict/index.vue
@@ -227,7 +227,6 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- reasonable: true,
dictName: undefined,
dictType: undefined,
status: undefined
diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue
index 143408c..7b4eb2d 100644
--- a/ruoyi-ui/src/views/system/notice/index.vue
+++ b/ruoyi-ui/src/views/system/notice/index.vue
@@ -204,7 +204,6 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- reasonable: true,
noticeTitle: undefined,
createBy: undefined,
status: undefined
diff --git a/ruoyi-ui/src/views/system/post/index.vue b/ruoyi-ui/src/views/system/post/index.vue
index 2784756..10eca78 100644
--- a/ruoyi-ui/src/views/system/post/index.vue
+++ b/ruoyi-ui/src/views/system/post/index.vue
@@ -192,7 +192,6 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- reasonable: true,
postCode: undefined,
postName: undefined,
status: undefined
diff --git a/ruoyi-ui/src/views/system/role/authUser.vue b/ruoyi-ui/src/views/system/role/authUser.vue
index 51edd33..a65ccbf 100644
--- a/ruoyi-ui/src/views/system/role/authUser.vue
+++ b/ruoyi-ui/src/views/system/role/authUser.vue
@@ -128,7 +128,6 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- reasonable: true,
roleId: undefined,
userName: undefined,
phonenumber: undefined
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index 0e92231..27167c9 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -328,7 +328,6 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- reasonable: true,
roleName: undefined,
roleKey: undefined,
status: undefined
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 5e8aed1..4607409 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -418,7 +418,6 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- reasonable: true,
userName: undefined,
phonenumber: undefined,
status: undefined,
diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue
index ab75b53..188b071 100644
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -219,7 +219,6 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- reasonable: true,
tableName: undefined,
tableComment: undefined
},
--
Gitblit v1.9.2