From 5ab2a889d8aac1541af76cdf056ae0c534cd7060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B9=A6=E7=84=B6?= <1182536780@qq.com>
Date: Sun, 9 Sep 2018 17:48:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E5=88=86=E9=A1=B5=E5=87=BD=E6=95=B0=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E9=80=A0=E6=88=90=E6=AD=A3=E5=B8=B8=E9=A1=B5=E9=9D=A2=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=B7=B7=E4=B9=B1=E3=80=82=202.=E5=AF=BC=E5=87=BAExce?=
 =?UTF-8?q?l=E5=88=9B=E5=BB=BAPage=E5=AE=9E=E4=BE=8B=E4=BC=A0=E5=85=A5-1?=
 =?UTF-8?q?=E5=8F=AA=E8=83=BD=E5=AF=BC=E5=87=BA=E5=BD=93=E5=89=8D=E9=A1=B5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeesite/common/persistence/Page.java      | 46 +++++++++++++------
 1 file changed, 31 insertions(+), 15 deletions(-)

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 b772b3ab7..b188eb53f 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<T> {
 	 * @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)){
-- 
Gitee