From ee823b8326fd1ae1c838828499643e2e57cf8263 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 02 九月 2021 10:19:04 +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-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java | 16 ++++++++++++++++
ruoyi-ui/src/views/system/dict/index.vue | 1 +
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java | 13 +++++++++++++
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 3 ++-
ruoyi-ui/src/api/login.js | 2 +-
ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java | 6 ++++++
ruoyi-ui/src/views/monitor/logininfor/index.vue | 1 +
ruoyi-ui/src/views/system/post/index.vue | 1 +
17 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index 3c26de5..5b450cb 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -57,7 +57,8 @@
if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
{
String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
- PageHelper.startPage(pageNum, pageSize, orderBy);
+ Boolean reasonable = pageDomain.getReasonable();
+ PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
}
}
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 b9d5e6e..e98fa41 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 @@
/** 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc */
private String isAsc = "asc";
+ /** 鍒嗛〉鍙傛暟鍚堢悊鍖� */
+ private Boolean reasonable = false;
+
public String getOrderBy()
{
if (StringUtils.isEmpty(orderByColumn))
@@ -81,4 +84,14 @@
this.isAsc = isAsc;
}
}
+
+ public Boolean getReasonable()
+ {
+ return reasonable;
+ }
+
+ public void setReasonable(Boolean reasonable)
+ {
+ this.reasonable = reasonable;
+ }
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
index 511e24b..03d0ce5 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
@@ -30,6 +30,11 @@
public static final String IS_ASC = "isAsc";
/**
+ * 鍒嗛〉鍙傛暟鍚堢悊鍖�
+ */
+ public static final String REASONABLE = "reasonable";
+
+ /**
* 灏佽鍒嗛〉瀵硅薄
*/
public static PageDomain getPageDomain()
@@ -39,6 +44,7 @@
pageDomain.setPageSize(ServletUtils.getParameterToInt(PAGE_SIZE));
pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN));
pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC));
+ pageDomain.setReasonable(ServletUtils.getParameterToBool(REASONABLE));
return pageDomain;
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
index 9e6fd59..a10c8ed 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
@@ -49,6 +49,22 @@
}
/**
+ * 鑾峰彇Boolean鍙傛暟
+ */
+ public static Boolean getParameterToBool(String name)
+ {
+ return Convert.toBool(getRequest().getParameter(name));
+ }
+
+ /**
+ * 鑾峰彇Boolean鍙傛暟
+ */
+ public static Boolean getParameterToBool(String name, Boolean defaultValue)
+ {
+ return Convert.toBool(getRequest().getParameter(name), defaultValue);
+ }
+
+ /**
* 鑾峰彇request
*/
public static HttpServletRequest getRequest()
diff --git a/ruoyi-ui/src/api/login.js b/ruoyi-ui/src/api/login.js
index 1113abe..2245616 100644
--- a/ruoyi-ui/src/api/login.js
+++ b/ruoyi-ui/src/api/login.js
@@ -48,6 +48,6 @@
return request({
url: '/captchaImage',
method: 'get',
- timeout: 20000
+ timeout: 20000
})
}
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue
index 6146633..c421097 100644
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@@ -320,6 +320,7 @@
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 b55b011..64216f3 100644
--- a/ruoyi-ui/src/views/monitor/job/log.vue
+++ b/ruoyi-ui/src/views/monitor/job/log.vue
@@ -220,6 +220,7 @@
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 59df72c..14921e5 100644
--- a/ruoyi-ui/src/views/monitor/logininfor/index.vue
+++ b/ruoyi-ui/src/views/monitor/logininfor/index.vue
@@ -153,6 +153,7 @@
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 b8472a8..f8b940c 100644
--- a/ruoyi-ui/src/views/system/config/index.vue
+++ b/ruoyi-ui/src/views/system/config/index.vue
@@ -219,6 +219,7 @@
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 aa3849a..f1ba191 100644
--- a/ruoyi-ui/src/views/system/dict/data.vue
+++ b/ruoyi-ui/src/views/system/dict/data.vue
@@ -247,6 +247,7 @@
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 20cf5ce..97c8100 100644
--- a/ruoyi-ui/src/views/system/dict/index.vue
+++ b/ruoyi-ui/src/views/system/dict/index.vue
@@ -227,6 +227,7 @@
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 7b4eb2d..143408c 100644
--- a/ruoyi-ui/src/views/system/notice/index.vue
+++ b/ruoyi-ui/src/views/system/notice/index.vue
@@ -204,6 +204,7 @@
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 10eca78..2784756 100644
--- a/ruoyi-ui/src/views/system/post/index.vue
+++ b/ruoyi-ui/src/views/system/post/index.vue
@@ -192,6 +192,7 @@
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 a65ccbf..51edd33 100644
--- a/ruoyi-ui/src/views/system/role/authUser.vue
+++ b/ruoyi-ui/src/views/system/role/authUser.vue
@@ -128,6 +128,7 @@
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 27167c9..0e92231 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -328,6 +328,7 @@
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 4607409..5e8aed1 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -418,6 +418,7 @@
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 188b071..ab75b53 100644
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -219,6 +219,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
+ reasonable: true,
tableName: undefined,
tableComment: undefined
},
--
Gitblit v1.9.3