From b3360987b4e65024497d3b5a2f01250f37989f7e Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Tue, 22 Nov 2016 09:08:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=AD=A3=E5=88=86=E9=A1=B5sql,?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/dao/mapper/data-details-mapper.xml            | 2 +-
 src/com/platform/entities/PagerOptions.java           | 2 +-
 src/com/platform/service/impl/DataInfoServiceImp.java | 4 ++--
 src/com/platform/utils/page/PageInterceptor.java      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/com/dao/mapper/data-details-mapper.xml b/src/com/dao/mapper/data-details-mapper.xml
index 8e8d0d73..d78cb690 100644
--- a/src/com/dao/mapper/data-details-mapper.xml
+++ b/src/com/dao/mapper/data-details-mapper.xml
@@ -65,7 +65,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 		</if>
 		<if test="array !=null and array.size() != 0">
 			<foreach collection="array" item="item" index="index">
-				AND CONCAT(regionalism_code,system_code,city_name,district_name,system_name,data_year) LIKE CONCAT('%',CONCAT(${item},'%'))
+				AND CONCAT(regionalism_code,system_code,city_name,district_name,system_name,data_year) LIKE CONCAT('%',CONCAT('${item}','%'))
 			</foreach>
 		</if>
 	</sql>
diff --git a/src/com/platform/entities/PagerOptions.java b/src/com/platform/entities/PagerOptions.java
index 596d143b..44b4a3c6 100644
--- a/src/com/platform/entities/PagerOptions.java
+++ b/src/com/platform/entities/PagerOptions.java
@@ -121,7 +121,7 @@ public class PagerOptions extends Page{
 	 * @param keyQuery the keyQuery to set
 	 */
 	public void setKeyQuery(String keyQuery) {
-		this.keyQuery = keyQuery;
+		this.keyQuery = keyQuery == null ? null: keyQuery.trim();
 	}
 
 	/**
diff --git a/src/com/platform/service/impl/DataInfoServiceImp.java b/src/com/platform/service/impl/DataInfoServiceImp.java
index 31676334..b2d10b92 100644
--- a/src/com/platform/service/impl/DataInfoServiceImp.java
+++ b/src/com/platform/service/impl/DataInfoServiceImp.java
@@ -48,7 +48,7 @@ public class DataInfoServiceImp implements DataInfoService {
 			//去掉版本字段
 			Pattern pattern = Pattern.compile("^版本\\d+$");
 			if (null != querystr && !"".equals(querystr)) {
-				querys = querystr.split(" ");
+				querys = querystr.trim().split(" ");
 				list = Arrays.asList(querys);
 			}
 			//遍历 list
@@ -69,7 +69,7 @@ public class DataInfoServiceImp implements DataInfoService {
 			int length = strs.length;
 			List<String> arrays = new ArrayList<String>();
 			for (int i = 0; i < length; i++) {
-				arrays.add(strs[i].toString());
+				arrays.add(strs[i].toString().trim());
 			}
 			for (String version : removelist) {
 				pagerOptions.setDataVersion(Integer.valueOf(version.replace("版本", "")));
diff --git a/src/com/platform/utils/page/PageInterceptor.java b/src/com/platform/utils/page/PageInterceptor.java
index 5c0c7344..4c5b94f8 100644
--- a/src/com/platform/utils/page/PageInterceptor.java
+++ b/src/com/platform/utils/page/PageInterceptor.java
@@ -73,7 +73,7 @@ public class PageInterceptor implements Interceptor {
                 String sql = boundSql.getSql();
                 Page co=(Page)(boundSql.getParameterObject());
                 // 重写 Sql语句  
-                log.info(sql.replaceAll("\n", "").replaceAll("\t", ""));
+                log.info(sql.replaceAll("\n", "").replaceAll("\t\t", "\t"));
                 String countSql=concatCountSql(sql);
                 Connection connection = (Connection) invocation.getArgs()[0];