From 9cfe4859aaaed671e4fca0041efb53fb19f7b9dd Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Fri, 9 Feb 2018 18:18:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9D=A5=E5=87=BD=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=90=9C=E7=B4=A2=E5=8F=8A?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/domain/Page.java            | 4 ++--
 src/main/webapp/WEB-INF/views/cfg/requestList.jsp | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nis/domain/Page.java b/src/main/java/com/nis/domain/Page.java
index f99f27d68..5a0bd210e 100644
--- a/src/main/java/com/nis/domain/Page.java
+++ b/src/main/java/com/nis/domain/Page.java
@@ -74,7 +74,7 @@ public class Page<T> {
 	 */
 	public Page(HttpServletRequest request, HttpServletResponse response){
 		
-		//this(request, response,Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30)));
+		this(request, response,Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30)));
 		
 	}
 	/**
@@ -338,7 +338,7 @@ public class Page<T> {
 		sb.append(funcName+"("+pageNo+",this.value,'"+funcParam+"');\" onclick=\"this.select();\"/> 条，");
 		sb.append("共 " + count + " 条"+(message!=null?message:"")+"</a></li>\n");
 
-		sb.insert(0,"<ul>\n").append("</ul>\n");
+//		sb.insert(0,"<ul>\n").append("</ul>\n");
 		
 		sb.append("<div style=\"clear:both;\"></div>");
 
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
index 860114798..a6c71b13f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
@@ -35,6 +35,7 @@
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<div class="col-md-12">
 							<spring:message code="state"></spring:message>&nbsp;:&nbsp;<select class="select2" name="isAudit">
+								<option value="${requestInfo.isAudit}"></option>
 								<option value="0"><spring:message code="created"></spring:message></option>
 								<option value="1"><spring:message code="approved"></spring:message></option>
 							</select> 
@@ -46,6 +47,7 @@
 							</select> &nbsp; <input id="intype"> &nbsp;
 							 
 							<select id="timeType" name="timeType">
+								<option value="${requestInfo.timeType}"></option>
 								<option value="requestTime"><spring:message code="request_time"></spring:message></option>
 								<option value="createTime"><spring:message code="operate_time"></spring:message></option>
 							</select> &nbsp; 
@@ -132,7 +134,7 @@
 					
 							</tbody>
 						</table>
-						<div class="page">${page}</div>	
+						<div class="pagination">${page}</div>	
 					</div>
 			</div>
 		</div>