Merge pull request Tencent#390 from SingleDogL/patch-2

TommyLemon · web-flow · commit b9da3fbe33a8 · 2022-04-30T22:11:45.000+08:00
修复oracle分页获取时无法获取除第一页以外的数据
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -3946,13 +3946,25 @@ public static String getSQL(AbstractSQLConfig config) throws Exception {
 						&& StringUtil.isNotEmpty(config.getGroup(),true)){
 					return explain + "SELECT count(*) FROM (SELECT " + (config.getCache() == JSONRequest.CACHE_RAM ? "SQL_NO_CACHE " : "") + column + " FROM " + getConditionString(column, tablePath, config) + ") " + config.getLimitString();
 				}
-				return explain + "SELECT * FROM (SELECT " + (config.getCache() == JSONRequest.CACHE_RAM ? "SQL_NO_CACHE " : "") + column + " FROM " + getConditionString(column, tablePath, config) + ") " + config.getLimitString();
+				String sql = "SELECT " + (config.getCache() == JSONRequest.CACHE_RAM ? "SQL_NO_CACHE " : "") + column + " FROM " + getConditionString(column, tablePath, config);
+                		return explain + config.getOraclePageSql(config, sql);
 			}
-
 			return explain + "SELECT " + (config.getCache() == JSONRequest.CACHE_RAM ? "SQL_NO_CACHE " : "") + column + " FROM " + getConditionString(column, tablePath, config) + config.getLimitString();
 		}
-	}
-
+	 }
+	
+	/**Oracle的分页获取
+	 * @param config
+	 * @param sql
+	 * @return
+	 */
+	 private String getOraclePageSql(AbstractSQLConfig config, String sql) {
+		int offset = getOffset(config.getPage(), config.getCount());
+		String pageSql;
+		pageSql = "SELECT * FROM (SELECT t.*,ROWNUM RN FROM (" + sql + ") t  WHERE ROWNUM <= " + (offset + count) + ") WHERE RN > " + offset;
+		return pageSql;
+	 }
+	
 	/**获取条件SQL字符串
 	 * @param column
 	 * @param table
