分页优化

Fasure · Aug 17, 2015 · 3bf01ca · 3bf01ca
1 parent 7660a87
commit 3bf01ca
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/main/java/com/thinkgem/jeesite/common/persistence/interceptor/SQLHelper.java b/src/main/java/com/thinkgem/jeesite/common/persistence/interceptor/SQLHelper.java
@@ -17,6 +17,7 @@
 import org.apache.ibatis.type.TypeHandler;
 import org.apache.ibatis.type.TypeHandlerRegistry;
 
+import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.persistence.dialect.Dialect;
 import com.thinkgem.jeesite.common.utils.Reflections;
@@ -100,8 +101,14 @@ public static void setParameters(PreparedStatement ps, MappedStatement mappedSta
     public static int getCount(final String sql, final Connection connection,
     							final MappedStatement mappedStatement, final Object parameterObject,
     							final BoundSql boundSql, Log log) throws SQLException {
-//        final String countSql = "select count(1) from (" + sql + ") tmp_count";
-        final String countSql = "select count(1) " + removeSelect(removeOrders(sql));
+    	String dbName = Global.getConfig("jdbc.type");
+		final String countSql;
+		if("oracle".equals(dbName)){
+			countSql = "select count(1) from (" + sql + ") tmp_count";
+		}else{
+			countSql = "select count(1) from (" + removeOrders(sql) + ") tmp_count";
+//	        countSql = "select count(1) " + removeSelect(removeOrders(sql));
+		}
         Connection conn = connection;
         PreparedStatement ps = null;
         ResultSet rs = null;

diff --git a/src/main/webapp/WEB-INF/tlds/fns.tld b/src/main/webapp/WEB-INF/tlds/fns.tld
@@ -137,6 +137,14 @@
     <example>${fns:getDictList(type)}</example>  
   </function>
 
+  <function>
+    <description>获取字典对象列表</description>
+    <name>getDictListJson</name>
+    <function-class>com.thinkgem.jeesite.modules.sys.utils.DictUtils</function-class>
+    <function-signature>java.lang.String getDictListJson(java.lang.String)</function-signature>
+    <example>${fns:getDictListJson(type)}</example>  
+  </function>
+
   <!-- Encodes -->
   <function>
     <description>URL编码</description>