Browse Source

jfinal 3.6

James 7 years ago
parent
commit
2a0193d6ba

+ 4 - 0
src/main/java/com/jfinal/plugin/activerecord/Db.java

@@ -686,6 +686,10 @@ public class Db {
     public static Page<Record> paginate(int pageNumber, int pageSize, SqlPara sqlPara) {
     	return MAIN.paginate(pageNumber, pageSize, sqlPara);
     }
+	
+	public static Page<Record> paginate(int pageNumber, int pageSize, boolean isGroupBySql, SqlPara sqlPara) {
+		return MAIN.paginate(pageNumber, pageSize, isGroupBySql, sqlPara);
+	}
 }
 
 

+ 5 - 0
src/main/java/com/jfinal/plugin/activerecord/DbPro.java

@@ -1302,6 +1302,11 @@ public class DbPro {
     	String[] sqls = PageSqlKit.parsePageSql(sqlPara.getSql());
     	return doPaginate(pageNumber, pageSize, null, sqls[0], sqls[1], sqlPara.getPara());
     }
+	
+	public Page<Record> paginate(int pageNumber, int pageSize, boolean isGroupBySql, SqlPara sqlPara) {
+		String[] sqls = PageSqlKit.parsePageSql(sqlPara.getSql());
+		return doPaginate(pageNumber, pageSize, isGroupBySql, sqls[0], sqls[1], sqlPara.getPara());
+	}
 }