diff --git a/src/main/java/com/thinkgem/jeesite/common/persistence/Page.java b/src/main/java/com/thinkgem/jeesite/common/persistence/Page.java index b772b3ab743bd949afe0dd28c6c6e7facc7f9b0b..b188eb53fc34bb9651da05c64a9e093885b570b3 100644 --- a/src/main/java/com/thinkgem/jeesite/common/persistence/Page.java +++ b/src/main/java/com/thinkgem/jeesite/common/persistence/Page.java @@ -70,41 +70,57 @@ public class Page { * @param defaultPageSize 默认分页大小,如果传递 -1 则为不分页,返回所有数据 */ public Page(HttpServletRequest request, HttpServletResponse response, int defaultPageSize){ + String funcName = request.getParameter("funcName"); + + String pageNo = "pageNo"; + String pageSize = "pageSize"; + + if (StringUtils.isNotBlank(funcName)){ + pageNo = "funcNamePageNo"; + pageSize = "funcNamePageSize"; + } + // 设置页码参数(传递repage参数,来记住页码) String no = request.getParameter("pageNo"); if (StringUtils.isNumeric(no)){ - CookieUtils.setCookie(response, "pageNo", no); + CookieUtils.setCookie(response, pageNo, no); this.setPageNo(Integer.parseInt(no)); }else if (request.getParameter("repage")!=null){ - no = CookieUtils.getCookie(request, "pageNo"); + no = CookieUtils.getCookie(request, pageNo); if (StringUtils.isNumeric(no)){ this.setPageNo(Integer.parseInt(no)); } } + // 设置页面大小参数(传递repage参数,来记住页码大小) String size = request.getParameter("pageSize"); if (StringUtils.isNumeric(size)){ - CookieUtils.setCookie(response, "pageSize", size); + + CookieUtils.setCookie(response, pageSize, size); this.setPageSize(Integer.parseInt(size)); }else if (request.getParameter("repage")!=null){ - size = CookieUtils.getCookie(request, "pageSize"); + + size = CookieUtils.getCookie(request, pageSize); if (StringUtils.isNumeric(size)){ this.setPageSize(Integer.parseInt(size)); } - }else if (defaultPageSize != -2){ + } + + if (defaultPageSize != -2){ this.pageSize = defaultPageSize; } + // 设置页面分页函数 - String funcName = request.getParameter("funcName"); - if (StringUtils.isNotBlank(funcName)){ - CookieUtils.setCookie(response, "funcName", funcName); - this.setFuncName(funcName); - }else if (request.getParameter("repage")!=null){ - funcName = CookieUtils.getCookie(request, "funcName"); - if (StringUtils.isNotBlank(funcName)){ - this.setFuncName(funcName); - } - } + if (StringUtils.isNotBlank(funcName)){ + CookieUtils.setCookie(response, funcName, funcName); + this.setFuncName(funcName); + }else if (request.getParameter("repage")!=null){ + funcName = CookieUtils.getCookie(request, funcName); + if (StringUtils.isNotBlank(funcName)){ + this.setFuncName(funcName); + } + } + // 设置排序参数 String orderBy = request.getParameter("orderBy"); if (StringUtils.isNotBlank(orderBy)){