diff --git a/src/main/java/com/smallchill/core/aop/AopContext.java b/src/main/java/com/smallchill/core/aop/AopContext.java index a6dc6621..39c04b97 100644 --- a/src/main/java/com/smallchill/core/aop/AopContext.java +++ b/src/main/java/com/smallchill/core/aop/AopContext.java @@ -66,6 +66,11 @@ public class AopContext { */ private String where; + /** + * 从前端grid传过来的排序方式 + */ + private String orderBy; + /** * 自定义列表的sql */ @@ -177,6 +182,14 @@ public class AopContext { this.where = where; } + public String getOrderBy() { + return orderBy; + } + + public void setOrderBy(String orderBy) { + this.orderBy = orderBy; + } + public String getSqlStatement() { return sqlStatement; } 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 dc638ec7..38ee9498 100644 --- a/src/main/java/com/smallchill/core/toolbox/grid/BaseGridFactory.java +++ b/src/main/java/com/smallchill/core/toolbox/grid/BaseGridFactory.java @@ -85,6 +85,7 @@ public abstract class BaseGridFactory implements IGrid{ ac.setSql(sqlTemplate); ac.setSqlEx(sqlex); ac.setCondition(""); + ac.setOrderBy(orderBy); ac.setSqlStatement(""); ac.setSqlCount(""); ac.setParam(map); diff --git a/src/test/java/com/smallchill/test/proxy/ProxyTest.java b/src/test/java/com/smallchill/test/proxy/ProxyTest.java index bbb7c6b4..e7e821a1 100644 --- a/src/test/java/com/smallchill/test/proxy/ProxyTest.java +++ b/src/test/java/com/smallchill/test/proxy/ProxyTest.java @@ -23,14 +23,6 @@ public class ProxyTest { test.test(); } - - @Test - public void testKit() { - TestProxyBean testBean = new TestProxyBean(); - IProxyKit test = ClassKit.newProxyInstance(testBean.getClass(), - new TestProxyHander(testBean)); - test.testKit(); - } @Test public void testCglib(){