From 353c1ff8b566698f4743b2a90acd1e4d09f9c9ff Mon Sep 17 00:00:00 2001
From: renkaige <renkaige@nismail.iie.ac.cn>
Date: Wed, 7 Nov 2018 10:44:35 +0800
Subject: [PATCH] =?UTF-8?q?1:=E8=A7=A3=E5=86=B3pageno=E5=92=8Cpagesize?=
 =?UTF-8?q?=E4=B8=8E=E7=95=8C=E9=9D=A2=E4=BC=A0=E5=85=A5=E7=9A=84=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98=202:=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3sql=E8=A2=AB=E8=BD=AC=E6=88=90=E5=B0=8F=E5=86=99?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/domain/Page.java                | 2 +-
 src/main/java/com/nis/web/service/LogDataService.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nis/domain/Page.java b/src/main/java/com/nis/domain/Page.java
index 733c2fb..fa864f4 100644
--- a/src/main/java/com/nis/domain/Page.java
+++ b/src/main/java/com/nis/domain/Page.java
@@ -518,7 +518,7 @@ public class Page<T> {
 	 */
 	public Page<T> setList(List<T> list) {
 		this.list = list;
-		initialize();
+//		initialize();
 		return this;
 	}
 
diff --git a/src/main/java/com/nis/web/service/LogDataService.java b/src/main/java/com/nis/web/service/LogDataService.java
index d7e706c..6d5b090 100644
--- a/src/main/java/com/nis/web/service/LogDataService.java
+++ b/src/main/java/com/nis/web/service/LogDataService.java
@@ -245,7 +245,7 @@ public class LogDataService {
 		} else {
 			sql.append(showColmun);
 		}
-		String sqlTrim = sql.toString().trim();
+		String sqlTrim= sql.toString().trim();
 		if (sqlTrim.endsWith(",")) {
 			sqlTrim = sqlTrim.substring(0, sqlTrim.length() - 1);
 		}
@@ -365,7 +365,7 @@ public class LogDataService {
 	 */
 	private <T> void searchFromDataCenter(Page<T> page, Object bean, StringBuffer selSql, StringBuffer countSql)
 			throws Exception {
-		new LogJDBCByDruid().getTableData(page, selSql.toString().toLowerCase(), bean.getClass());
+		new LogJDBCByDruid().getTableData(page, selSql.toString(), bean.getClass());
 		if (Constants.ISOPENLOGCOUNTANDLAST) {
 			if (page.getList() != null && page.getList().size() > 0) {
 				new LogJDBCByDruid().getCount(page, countSql.toString().toLowerCase());