From 3fb6e95bb98cc25c4eba59e560fc236f16c7e506 Mon Sep 17 00:00:00 2001
From: zhuangqian <smallchill@163.com>
Date: Wed, 8 Mar 2017 15:15:12 +0800
Subject: [PATCH] update

---
 pom.xml                                                  | 2 +-
 .../smallchill/core/toolbox/grid/BaseGridFactory.java    | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 22fbf429..a7408554 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 		<!-- 编译jdk版本 -->
 		<jdk.version>1.7</jdk.version>
 		<!-- 依赖版本 -->
-		<spring.version>4.3.5.RELEASE</spring.version>
+		<spring.version>4.3.6.RELEASE</spring.version>
 		<shiro.version>1.3.2</shiro.version>
 		<log4j2.version>2.7</log4j2.version>
 		<beetlsql.version>2.8.5</beetlsql.version>
diff --git a/src/main/java/com/smallchill/core/toolbox/grid/BaseGridFactory.java b/src/main/java/com/smallchill/core/toolbox/grid/BaseGridFactory.java
index 5f6d3565..b88632fa 100644
--- a/src/main/java/com/smallchill/core/toolbox/grid/BaseGridFactory.java
+++ b/src/main/java/com/smallchill/core/toolbox/grid/BaseGridFactory.java
@@ -15,9 +15,6 @@
  */
 package com.smallchill.core.toolbox.grid;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import com.smallchill.core.aop.AopContext;
 import com.smallchill.core.base.controller.BladeController;
 import com.smallchill.core.constant.Const;
@@ -30,6 +27,9 @@ import com.smallchill.core.toolbox.kit.StrKit;
 import com.smallchill.core.toolbox.support.Convert;
 import com.smallchill.core.toolbox.support.SqlKeyword;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * grid工厂基类,封装通用分页方法
  */
@@ -44,8 +44,6 @@ public abstract class BaseGridFactory implements IGrid {
 	 *            当前页号
 	 * @param rows
 	 *            每页的数量
-	 * @param sql
-	 *            数据源
 	 * @param para
 	 *            额外条件 {"id":1,"title":"test"}
 	 * @param sort
@@ -92,6 +90,7 @@ public abstract class BaseGridFactory implements IGrid {
 			intercept.queryBefore(ac);
 			sqlCount = ac.getSqlCount();
 			sqlex = ac.getSqlEx();
+			orderBy = ac.getOrderBy();
 			statement = (StrKit.isBlank(ac.getSqlStatement()) ? (statement + (StrKit.isBlank(ac.getWhere()) ? (sqlex + ac.getCondition()) : ac.getWhere()) + orderBy) : ac.getSqlStatement());
 		} else {
 			statement = statement + sqlex + orderBy;
-- 
GitLab