github/SpringBlade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zhuangqian 2017-03-08 15:15:12 +08:00
parent 7cff072140
commit 3fb6e95bb9
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -15,7 +15,7 @@
<!-- 编译jdk版本 --> <!-- 编译jdk版本 -->
<jdk.version>1.7</jdk.version> <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> <shiro.version>1.3.2</shiro.version>
<log4j2.version>2.7</log4j2.version> <log4j2.version>2.7</log4j2.version>
<beetlsql.version>2.8.5</beetlsql.version> <beetlsql.version>2.8.5</beetlsql.version>

9
src/main/java/com/smallchill/core/toolbox/grid/BaseGridFactory.java
View File

@ -15,9 +15,6 @@
*/ */
package com.smallchill.core.toolbox.grid; package com.smallchill.core.toolbox.grid;
import java.util.HashMap;
import java.util.Map;
import com.smallchill.core.aop.AopContext; import com.smallchill.core.aop.AopContext;
import com.smallchill.core.base.controller.BladeController; import com.smallchill.core.base.controller.BladeController;
import com.smallchill.core.constant.Const; 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.Convert;
import com.smallchill.core.toolbox.support.SqlKeyword; import com.smallchill.core.toolbox.support.SqlKeyword;
import java.util.HashMap;
import java.util.Map;
/** /**
* grid工厂基类,封装通用分页方法 * grid工厂基类,封装通用分页方法
*/ */
@ -44,8 +44,6 @@ public abstract class BaseGridFactory implements IGrid {
* 当前页号 * 当前页号
* @param rows * @param rows
* 每页的数量 * 每页的数量
* @param sql
* 数据源
* @param para * @param para
* 额外条件 {"id":1,"title":"test"} * 额外条件 {"id":1,"title":"test"}
* @param sort * @param sort
@ -92,6 +90,7 @@ public abstract class BaseGridFactory implements IGrid {
intercept.queryBefore(ac); intercept.queryBefore(ac);
sqlCount = ac.getSqlCount(); sqlCount = ac.getSqlCount();
sqlex = ac.getSqlEx(); sqlex = ac.getSqlEx();
orderBy = ac.getOrderBy();
statement = (StrKit.isBlank(ac.getSqlStatement()) ? (statement + (StrKit.isBlank(ac.getWhere()) ? (sqlex + ac.getCondition()) : ac.getWhere()) + orderBy) : ac.getSqlStatement()); statement = (StrKit.isBlank(ac.getSqlStatement()) ? (statement + (StrKit.isBlank(ac.getWhere()) ? (sqlex + ac.getCondition()) : ac.getWhere()) + orderBy) : ac.getSqlStatement());
} else { } else {
statement = statement + sqlex + orderBy; statement = statement + sqlex + orderBy;