作者 RuoYi

设置分页参数默认值

1 package com.ruoyi.common.core.page; 1 package com.ruoyi.common.core.page;
2 2
  3 +import com.ruoyi.common.core.text.Convert;
3 import com.ruoyi.common.utils.ServletUtils; 4 import com.ruoyi.common.utils.ServletUtils;
4 5
5 /** 6 /**
@@ -40,8 +41,8 @@ public class TableSupport @@ -40,8 +41,8 @@ public class TableSupport
40 public static PageDomain getPageDomain() 41 public static PageDomain getPageDomain()
41 { 42 {
42 PageDomain pageDomain = new PageDomain(); 43 PageDomain pageDomain = new PageDomain();
43 - pageDomain.setPageNum(ServletUtils.getParameterToInt(PAGE_NUM));  
44 - pageDomain.setPageSize(ServletUtils.getParameterToInt(PAGE_SIZE)); 44 + pageDomain.setPageNum(Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1));
  45 + pageDomain.setPageSize(Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10));
45 pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN)); 46 pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN));
46 pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC)); 47 pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC));
47 pageDomain.setReasonable(ServletUtils.getParameterToBool(REASONABLE)); 48 pageDomain.setReasonable(ServletUtils.getParameterToBool(REASONABLE));
@@ -20,12 +20,9 @@ public class PageUtils extends PageHelper @@ -20,12 +20,9 @@ public class PageUtils extends PageHelper
20 PageDomain pageDomain = TableSupport.buildPageRequest(); 20 PageDomain pageDomain = TableSupport.buildPageRequest();
21 Integer pageNum = pageDomain.getPageNum(); 21 Integer pageNum = pageDomain.getPageNum();
22 Integer pageSize = pageDomain.getPageSize(); 22 Integer pageSize = pageDomain.getPageSize();
23 - if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))  
24 - {  
25 - String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());  
26 - Boolean reasonable = pageDomain.getReasonable();  
27 - PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);  
28 - } 23 + String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
  24 + Boolean reasonable = pageDomain.getReasonable();
  25 + PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
29 } 26 }
30 27
31 /** 28 /**