作者 RuoYi

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

@@ -57,7 +57,8 @@ public class BaseController @@ -57,7 +57,8 @@ public class BaseController
57 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) 57 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
58 { 58 {
59 String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); 59 String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
60 - PageHelper.startPage(pageNum, pageSize, orderBy); 60 + Boolean reasonable = pageDomain.getReasonable();
  61 + PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
61 } 62 }
62 } 63 }
63 64
@@ -21,6 +21,9 @@ public class PageDomain @@ -21,6 +21,9 @@ public class PageDomain
21 /** 排序的方向desc或者asc */ 21 /** 排序的方向desc或者asc */
22 private String isAsc = "asc"; 22 private String isAsc = "asc";
23 23
  24 + /** 分页参数合理化 */
  25 + private Boolean reasonable = false;
  26 +
24 public String getOrderBy() 27 public String getOrderBy()
25 { 28 {
26 if (StringUtils.isEmpty(orderByColumn)) 29 if (StringUtils.isEmpty(orderByColumn))
@@ -81,4 +84,14 @@ public class PageDomain @@ -81,4 +84,14 @@ public class PageDomain
81 this.isAsc = isAsc; 84 this.isAsc = isAsc;
82 } 85 }
83 } 86 }
  87 +
  88 + public Boolean getReasonable()
  89 + {
  90 + return reasonable;
  91 + }
  92 +
  93 + public void setReasonable(Boolean reasonable)
  94 + {
  95 + this.reasonable = reasonable;
  96 + }
84 } 97 }
@@ -30,6 +30,11 @@ public class TableSupport @@ -30,6 +30,11 @@ public class TableSupport
30 public static final String IS_ASC = "isAsc"; 30 public static final String IS_ASC = "isAsc";
31 31
32 /** 32 /**
  33 + * 分页参数合理化
  34 + */
  35 + public static final String REASONABLE = "reasonable";
  36 +
  37 + /**
33 * 封装分页对象 38 * 封装分页对象
34 */ 39 */
35 public static PageDomain getPageDomain() 40 public static PageDomain getPageDomain()
@@ -39,6 +44,7 @@ public class TableSupport @@ -39,6 +44,7 @@ public class TableSupport
39 pageDomain.setPageSize(ServletUtils.getParameterToInt(PAGE_SIZE)); 44 pageDomain.setPageSize(ServletUtils.getParameterToInt(PAGE_SIZE));
40 pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN)); 45 pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN));
41 pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC)); 46 pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC));
  47 + pageDomain.setReasonable(ServletUtils.getParameterToBool(REASONABLE));
42 return pageDomain; 48 return pageDomain;
43 } 49 }
44 50
@@ -49,6 +49,22 @@ public class ServletUtils @@ -49,6 +49,22 @@ public class ServletUtils
49 } 49 }
50 50
51 /** 51 /**
  52 + * 获取Boolean参数
  53 + */
  54 + public static Boolean getParameterToBool(String name)
  55 + {
  56 + return Convert.toBool(getRequest().getParameter(name));
  57 + }
  58 +
  59 + /**
  60 + * 获取Boolean参数
  61 + */
  62 + public static Boolean getParameterToBool(String name, Boolean defaultValue)
  63 + {
  64 + return Convert.toBool(getRequest().getParameter(name), defaultValue);
  65 + }
  66 +
  67 + /**
52 * 获取request 68 * 获取request
53 */ 69 */
54 public static HttpServletRequest getRequest() 70 public static HttpServletRequest getRequest()
@@ -320,6 +320,7 @@ export default { @@ -320,6 +320,7 @@ export default {
320 queryParams: { 320 queryParams: {
321 pageNum: 1, 321 pageNum: 1,
322 pageSize: 10, 322 pageSize: 10,
  323 + reasonable: true,
323 jobName: undefined, 324 jobName: undefined,
324 jobGroup: undefined, 325 jobGroup: undefined,
325 status: undefined 326 status: undefined
@@ -220,6 +220,7 @@ export default { @@ -220,6 +220,7 @@ export default {
220 queryParams: { 220 queryParams: {
221 pageNum: 1, 221 pageNum: 1,
222 pageSize: 10, 222 pageSize: 10,
  223 + reasonable: true,
223 jobName: undefined, 224 jobName: undefined,
224 jobGroup: undefined, 225 jobGroup: undefined,
225 status: undefined 226 status: undefined
@@ -153,6 +153,7 @@ export default { @@ -153,6 +153,7 @@ export default {
153 queryParams: { 153 queryParams: {
154 pageNum: 1, 154 pageNum: 1,
155 pageSize: 10, 155 pageSize: 10,
  156 + reasonable: true,
156 ipaddr: undefined, 157 ipaddr: undefined,
157 userName: undefined, 158 userName: undefined,
158 status: undefined 159 status: undefined
@@ -219,6 +219,7 @@ export default { @@ -219,6 +219,7 @@ export default {
219 queryParams: { 219 queryParams: {
220 pageNum: 1, 220 pageNum: 1,
221 pageSize: 10, 221 pageSize: 10,
  222 + reasonable: true,
222 configName: undefined, 223 configName: undefined,
223 configKey: undefined, 224 configKey: undefined,
224 configType: undefined 225 configType: undefined
@@ -247,6 +247,7 @@ export default { @@ -247,6 +247,7 @@ export default {
247 queryParams: { 247 queryParams: {
248 pageNum: 1, 248 pageNum: 1,
249 pageSize: 10, 249 pageSize: 10,
  250 + reasonable: true,
250 dictName: undefined, 251 dictName: undefined,
251 dictType: undefined, 252 dictType: undefined,
252 status: undefined 253 status: undefined
@@ -227,6 +227,7 @@ export default { @@ -227,6 +227,7 @@ export default {
227 queryParams: { 227 queryParams: {
228 pageNum: 1, 228 pageNum: 1,
229 pageSize: 10, 229 pageSize: 10,
  230 + reasonable: true,
230 dictName: undefined, 231 dictName: undefined,
231 dictType: undefined, 232 dictType: undefined,
232 status: undefined 233 status: undefined
@@ -204,6 +204,7 @@ export default { @@ -204,6 +204,7 @@ export default {
204 queryParams: { 204 queryParams: {
205 pageNum: 1, 205 pageNum: 1,
206 pageSize: 10, 206 pageSize: 10,
  207 + reasonable: true,
207 noticeTitle: undefined, 208 noticeTitle: undefined,
208 createBy: undefined, 209 createBy: undefined,
209 status: undefined 210 status: undefined
@@ -192,6 +192,7 @@ export default { @@ -192,6 +192,7 @@ export default {
192 queryParams: { 192 queryParams: {
193 pageNum: 1, 193 pageNum: 1,
194 pageSize: 10, 194 pageSize: 10,
  195 + reasonable: true,
195 postCode: undefined, 196 postCode: undefined,
196 postName: undefined, 197 postName: undefined,
197 status: undefined 198 status: undefined
@@ -128,6 +128,7 @@ export default { @@ -128,6 +128,7 @@ export default {
128 queryParams: { 128 queryParams: {
129 pageNum: 1, 129 pageNum: 1,
130 pageSize: 10, 130 pageSize: 10,
  131 + reasonable: true,
131 roleId: undefined, 132 roleId: undefined,
132 userName: undefined, 133 userName: undefined,
133 phonenumber: undefined 134 phonenumber: undefined
@@ -328,6 +328,7 @@ export default { @@ -328,6 +328,7 @@ export default {
328 queryParams: { 328 queryParams: {
329 pageNum: 1, 329 pageNum: 1,
330 pageSize: 10, 330 pageSize: 10,
  331 + reasonable: true,
331 roleName: undefined, 332 roleName: undefined,
332 roleKey: undefined, 333 roleKey: undefined,
333 status: undefined 334 status: undefined
@@ -418,6 +418,7 @@ export default { @@ -418,6 +418,7 @@ export default {
418 queryParams: { 418 queryParams: {
419 pageNum: 1, 419 pageNum: 1,
420 pageSize: 10, 420 pageSize: 10,
  421 + reasonable: true,
421 userName: undefined, 422 userName: undefined,
422 phonenumber: undefined, 423 phonenumber: undefined,
423 status: undefined, 424 status: undefined,
@@ -219,6 +219,7 @@ export default { @@ -219,6 +219,7 @@ export default {
219 queryParams: { 219 queryParams: {
220 pageNum: 1, 220 pageNum: 1,
221 pageSize: 10, 221 pageSize: 10,
  222 + reasonable: true,
222 tableName: undefined, 223 tableName: undefined,
223 tableComment: undefined 224 tableComment: undefined
224 }, 225 },