diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java index 67cf72cb6..17a12f143 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java @@ -36,11 +36,6 @@ public class PageUtils { */ public static final String IS_ASC = "isAsc"; - /** - * 分页参数合理化 - */ - private static final String REASONABLE = "reasonable"; - /** * 当前记录起始索引 默认值 */ @@ -51,11 +46,6 @@ public class PageUtils { */ public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE; - /** - * 分页参数合理化 默认值 - */ - private static final Boolean DEFAULT_REASONABLE = Boolean.TRUE; - /** * 构建 plus 分页对象 * @param domain 实体 @@ -67,10 +57,8 @@ public class PageUtils { Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE, DEFAULT_PAGE_SIZE); String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN); String isAsc = ServletUtils.getParameter(IS_ASC); - Boolean reasonable = ServletUtils.getParameterToBool(REASONABLE, DEFAULT_REASONABLE); - //分页合理化,针对不合理的页码自动处理 - if (reasonable && pageNum <= 0) { - pageNum = 1; + if (pageNum <= 0) { + pageNum = DEFAULT_PAGE_NUM; } PagePlus page = new PagePlus<>(pageNum, pageSize); if (StringUtils.isNotBlank(orderByColumn)) { @@ -98,10 +86,8 @@ public class PageUtils { Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE, DEFAULT_PAGE_SIZE); String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN, defaultOrderByColumn); String isAsc = ServletUtils.getParameter(IS_ASC, defaultIsAsc); - Boolean reasonable = ServletUtils.getParameterToBool(REASONABLE, DEFAULT_REASONABLE); - //分页合理化,针对不合理的页码自动处理 - if (reasonable && pageNum <= 0) { - pageNum = 1; + if (pageNum <= 0) { + pageNum = DEFAULT_PAGE_NUM; } // 兼容前端排序类型 if ("ascending".equals(isAsc)) { diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index aec95dbd5..4b055faa0 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -367,7 +367,6 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - reasonable: true, #foreach ($column in $columns) #if($column.query) $column.javaField: undefined#if($velocityCount != $columns.size()),#end diff --git a/ruoyi-ui/src/views/demo/demo/index.vue b/ruoyi-ui/src/views/demo/demo/index.vue index c7f500dd5..791ab7e62 100644 --- a/ruoyi-ui/src/views/demo/demo/index.vue +++ b/ruoyi-ui/src/views/demo/demo/index.vue @@ -205,7 +205,6 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - reasonable: true, testKey: undefined, value: undefined, createTime: undefined, diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue index f73cfc8e0..625680455 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 561924b79..7e4dffe50 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 bba455316..778492ba4 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 2c69ee484..04384bb75 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 1aa61cc59..3b8ec4b76 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 02eabfb44..b4ac1da04 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 f2ae9bbd3..b90168c49 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/oss/config.vue b/ruoyi-ui/src/views/system/oss/config.vue index c87ef92d5..28bdbe5b7 100644 --- a/ruoyi-ui/src/views/system/oss/config.vue +++ b/ruoyi-ui/src/views/system/oss/config.vue @@ -223,7 +223,6 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - reasonable: true, configKey: undefined, bucketName: undefined, status: undefined, diff --git a/ruoyi-ui/src/views/system/oss/index.vue b/ruoyi-ui/src/views/system/oss/index.vue index 87bedc90b..2bbbba060 100644 --- a/ruoyi-ui/src/views/system/oss/index.vue +++ b/ruoyi-ui/src/views/system/oss/index.vue @@ -226,7 +226,6 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - reasonable: true, fileName: undefined, originalName: undefined, fileSuffix: undefined, diff --git a/ruoyi-ui/src/views/system/post/index.vue b/ruoyi-ui/src/views/system/post/index.vue index 7a68efa2a..735d616a5 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 a479069c9..59880bdc4 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 22eaa4b9e..d06d50040 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 30d9908dd..1b69e21fd 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 },