欧阳子桐 / RuoYi · 提交

转到一个项目

作者 RuoYi
提交 a15bfdfb46cd949c20080ab82fa74ab57bd1955d 1 个父辈 ee823b83

防止表格最后页最后项删除变成暂无数据

内嵌 并排对比
正在显示 13 个修改的文件 包含 5 行增加 和 13 行删除
@@ -22,7 +22,7 @@ public class PageDomain @@ -22,7 +22,7 @@ public class PageDomain
22 private String isAsc = "asc"; 22 private String isAsc = "asc";
23 23
24 /** 分页参数合理化 */ 24 /** 分页参数合理化 */
25 - private Boolean reasonable = false; 25 + private Boolean reasonable = true;
26 26
27 public String getOrderBy() 27 public String getOrderBy()
28 { 28 {
@@ -87,6 +87,10 @@ public class PageDomain @@ -87,6 +87,10 @@ public class PageDomain
87 87
88 public Boolean getReasonable() 88 public Boolean getReasonable()
89 { 89 {
  90 + if (StringUtils.isNull(reasonable))
  91 + {
  92 + return Boolean.TRUE;
  93 + }
90 return reasonable; 94 return reasonable;
91 } 95 }
92 96
@@ -320,7 +320,6 @@ export default { @@ -320,7 +320,6 @@ export default {
320 queryParams: { 320 queryParams: {
321 pageNum: 1, 321 pageNum: 1,
322 pageSize: 10, 322 pageSize: 10,
323 - reasonable: true,  
324 jobName: undefined, 323 jobName: undefined,
325 jobGroup: undefined, 324 jobGroup: undefined,
326 status: undefined 325 status: undefined
@@ -220,7 +220,6 @@ export default { @@ -220,7 +220,6 @@ export default {
220 queryParams: { 220 queryParams: {
221 pageNum: 1, 221 pageNum: 1,
222 pageSize: 10, 222 pageSize: 10,
223 - reasonable: true,  
224 jobName: undefined, 223 jobName: undefined,
225 jobGroup: undefined, 224 jobGroup: undefined,
226 status: undefined 225 status: undefined
@@ -153,7 +153,6 @@ export default { @@ -153,7 +153,6 @@ export default {
153 queryParams: { 153 queryParams: {
154 pageNum: 1, 154 pageNum: 1,
155 pageSize: 10, 155 pageSize: 10,
156 - reasonable: true,  
157 ipaddr: undefined, 156 ipaddr: undefined,
158 userName: undefined, 157 userName: undefined,
159 status: undefined 158 status: undefined
@@ -219,7 +219,6 @@ export default { @@ -219,7 +219,6 @@ export default {
219 queryParams: { 219 queryParams: {
220 pageNum: 1, 220 pageNum: 1,
221 pageSize: 10, 221 pageSize: 10,
222 - reasonable: true,  
223 configName: undefined, 222 configName: undefined,
224 configKey: undefined, 223 configKey: undefined,
225 configType: undefined 224 configType: undefined
@@ -247,7 +247,6 @@ export default { @@ -247,7 +247,6 @@ export default {
247 queryParams: { 247 queryParams: {
248 pageNum: 1, 248 pageNum: 1,
249 pageSize: 10, 249 pageSize: 10,
250 - reasonable: true,  
251 dictName: undefined, 250 dictName: undefined,
252 dictType: undefined, 251 dictType: undefined,
253 status: undefined 252 status: undefined
@@ -227,7 +227,6 @@ export default { @@ -227,7 +227,6 @@ export default {
227 queryParams: { 227 queryParams: {
228 pageNum: 1, 228 pageNum: 1,
229 pageSize: 10, 229 pageSize: 10,
230 - reasonable: true,  
231 dictName: undefined, 230 dictName: undefined,
232 dictType: undefined, 231 dictType: undefined,
233 status: undefined 232 status: undefined
@@ -204,7 +204,6 @@ export default { @@ -204,7 +204,6 @@ export default {
204 queryParams: { 204 queryParams: {
205 pageNum: 1, 205 pageNum: 1,
206 pageSize: 10, 206 pageSize: 10,
207 - reasonable: true,  
208 noticeTitle: undefined, 207 noticeTitle: undefined,
209 createBy: undefined, 208 createBy: undefined,
210 status: undefined 209 status: undefined
@@ -192,7 +192,6 @@ export default { @@ -192,7 +192,6 @@ export default {
192 queryParams: { 192 queryParams: {
193 pageNum: 1, 193 pageNum: 1,
194 pageSize: 10, 194 pageSize: 10,
195 - reasonable: true,  
196 postCode: undefined, 195 postCode: undefined,
197 postName: undefined, 196 postName: undefined,
198 status: undefined 197 status: undefined
@@ -128,7 +128,6 @@ export default { @@ -128,7 +128,6 @@ export default {
128 queryParams: { 128 queryParams: {
129 pageNum: 1, 129 pageNum: 1,
130 pageSize: 10, 130 pageSize: 10,
131 - reasonable: true,  
132 roleId: undefined, 131 roleId: undefined,
133 userName: undefined, 132 userName: undefined,
134 phonenumber: undefined 133 phonenumber: undefined
@@ -328,7 +328,6 @@ export default { @@ -328,7 +328,6 @@ export default {
328 queryParams: { 328 queryParams: {
329 pageNum: 1, 329 pageNum: 1,
330 pageSize: 10, 330 pageSize: 10,
331 - reasonable: true,  
332 roleName: undefined, 331 roleName: undefined,
333 roleKey: undefined, 332 roleKey: undefined,
334 status: undefined 333 status: undefined
@@ -418,7 +418,6 @@ export default { @@ -418,7 +418,6 @@ export default {
418 queryParams: { 418 queryParams: {
419 pageNum: 1, 419 pageNum: 1,
420 pageSize: 10, 420 pageSize: 10,
421 - reasonable: true,  
422 userName: undefined, 421 userName: undefined,
423 phonenumber: undefined, 422 phonenumber: undefined,
424 status: undefined, 423 status: undefined,
@@ -219,7 +219,6 @@ export default { @@ -219,7 +219,6 @@ export default {
219 queryParams: { 219 queryParams: {
220 pageNum: 1, 220 pageNum: 1,
221 pageSize: 10, 221 pageSize: 10,
222 - reasonable: true,  
223 tableName: undefined, 222 tableName: undefined,
224 tableComment: undefined 223 tableComment: undefined
225 }, 224 },