clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

分页问题修复

This commit is contained in:
donqi 2022-07-09 18:40:41 +08:00
parent 596fc51e7f
commit fb3fd4fe3d
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -163,13 +163,12 @@ public class OrderMasterController extends BaseController {
rspData.setTotal(orderListResponses.size()); rspData.setTotal(orderListResponses.size());
return rspData; return rspData;
} }
Integer pageNum = pageDomain.getPageNum() * 10; Integer pageSize = pageDomain.getPageNum() * 10;
Integer pageSize = (pageDomain.getPageNum() + 1) * 10;
if (pageSize > orderListResponses.size()) if (pageSize > orderListResponses.size())
{ {
pageSize = orderListResponses.size(); pageSize = orderListResponses.size();
} }
rspData.setRows(orderListResponses.subList(pageNum, pageSize)); rspData.setRows(orderListResponses.subList(0, pageSize));
rspData.setTotal(orderListResponses.size()); rspData.setTotal(orderListResponses.size());
return rspData; return rspData;
} }

6
ghy-common/src/main/java/com/ghy/common/core/page/PageDomain.java
View File

@ -4,7 +4,7 @@ import com.ghy.common.utils.StringUtils;
/** /**
* 分页数据 * 分页数据
* *
* @author clunt * @author clunt
*/ */
public class PageDomain public class PageDomain
@ -22,7 +22,7 @@ public class PageDomain
private String isAsc = "asc"; private String isAsc = "asc";
/** 分页参数合理化 */ /** 分页参数合理化 */
private Boolean reasonable = true; private Boolean reasonable = false;
public String getOrderBy() public String getOrderBy()
{ {
@ -77,7 +77,7 @@ public class PageDomain
{ {
if (StringUtils.isNull(reasonable)) if (StringUtils.isNull(reasonable))
{ {
return Boolean.TRUE; return Boolean.FALSE;
} }
return reasonable; return reasonable;
} }