From a15bfdfb46cd949c20080ab82fa74ab57bd1955d Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 2 Sep 2021 10:55:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E8=A1=A8=E6=A0=BC=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E9=A1=B5=E6=9C=80=E5=90=8E=E9=A1=B9=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=8F=98=E6=88=90=E6=9A=82=E6=97=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/common/core/page/PageDomain.java | 6 +++++- ruoyi-ui/src/views/monitor/job/index.vue | 1 - ruoyi-ui/src/views/monitor/job/log.vue | 1 - ruoyi-ui/src/views/monitor/logininfor/index.vue | 1 - ruoyi-ui/src/views/system/config/index.vue | 1 - ruoyi-ui/src/views/system/dict/data.vue | 1 - ruoyi-ui/src/views/system/dict/index.vue | 1 - ruoyi-ui/src/views/system/notice/index.vue | 1 - ruoyi-ui/src/views/system/post/index.vue | 1 - ruoyi-ui/src/views/system/role/authUser.vue | 1 - ruoyi-ui/src/views/system/role/index.vue | 1 - ruoyi-ui/src/views/system/user/index.vue | 1 - ruoyi-ui/src/views/tool/gen/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 e98fa4119..8966cb4c4 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 @@ public class PageDomain private String isAsc = "asc"; /** 分页参数合理化 */ - private Boolean reasonable = false; + private Boolean reasonable = true; public String getOrderBy() { @@ -87,6 +87,10 @@ public class PageDomain 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 c4210972a..614663358 100644 --- a/ruoyi-ui/src/views/monitor/job/index.vue +++ b/ruoyi-ui/src/views/monitor/job/index.vue @@ -320,7 +320,6 @@ export default { 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 64216f3d8..b55b01150 100644 --- a/ruoyi-ui/src/views/monitor/job/log.vue +++ b/ruoyi-ui/src/views/monitor/job/log.vue @@ -220,7 +220,6 @@ export default { 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 14921e528..59df72ce0 100644 --- a/ruoyi-ui/src/views/monitor/logininfor/index.vue +++ b/ruoyi-ui/src/views/monitor/logininfor/index.vue @@ -153,7 +153,6 @@ export default { 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 f8b940c57..b8472a802 100644 --- a/ruoyi-ui/src/views/system/config/index.vue +++ b/ruoyi-ui/src/views/system/config/index.vue @@ -219,7 +219,6 @@ export default { 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 f1ba191c8..aa3849a62 100644 --- a/ruoyi-ui/src/views/system/dict/data.vue +++ b/ruoyi-ui/src/views/system/dict/data.vue @@ -247,7 +247,6 @@ export default { 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 97c810069..20cf5ce97 100644 --- a/ruoyi-ui/src/views/system/dict/index.vue +++ b/ruoyi-ui/src/views/system/dict/index.vue @@ -227,7 +227,6 @@ export default { 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 143408c0f..7b4eb2d06 100644 --- a/ruoyi-ui/src/views/system/notice/index.vue +++ b/ruoyi-ui/src/views/system/notice/index.vue @@ -204,7 +204,6 @@ export default { 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 278475605..10eca78a8 100644 --- a/ruoyi-ui/src/views/system/post/index.vue +++ b/ruoyi-ui/src/views/system/post/index.vue @@ -192,7 +192,6 @@ export default { 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 51edd3322..a65ccbf6e 100644 --- a/ruoyi-ui/src/views/system/role/authUser.vue +++ b/ruoyi-ui/src/views/system/role/authUser.vue @@ -128,7 +128,6 @@ export default { 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 0e92231a0..27167c9db 100644 --- a/ruoyi-ui/src/views/system/role/index.vue +++ b/ruoyi-ui/src/views/system/role/index.vue @@ -328,7 +328,6 @@ export default { 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 5e8aed181..460740924 100644 --- a/ruoyi-ui/src/views/system/user/index.vue +++ b/ruoyi-ui/src/views/system/user/index.vue @@ -418,7 +418,6 @@ export default { 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 ab75b5392..188b071c2 100644 --- a/ruoyi-ui/src/views/tool/gen/index.vue +++ b/ruoyi-ui/src/views/tool/gen/index.vue @@ -219,7 +219,6 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - reasonable: true, tableName: undefined, tableComment: undefined },