diff --git a/CHANGELOG.md b/CHANGELOG.md index 012ed6b7f..c20eac843 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,11 +3,12 @@ ------------------------------------------------------------------------------------------------------------- -# 5.8.10.M1 (2022-10-22) +# 5.8.10.M1 (2022-10-23) ### 🐣新特性 ### 🐞Bug修复 +* 【db 】 修复分页时order by截断问题(issue#I5X6FM@Gitee) ------------------------------------------------------------------------------------------------------------- # 5.8.9 (2022-10-22) diff --git a/hutool-db/src/main/java/cn/hutool/db/DialectRunner.java b/hutool-db/src/main/java/cn/hutool/db/DialectRunner.java index 24c535c4b..74db2e257 100644 --- a/hutool-db/src/main/java/cn/hutool/db/DialectRunner.java +++ b/hutool-db/src/main/java/cn/hutool/db/DialectRunner.java @@ -272,7 +272,7 @@ public class DialectRunner implements Serializable { String selectSql = sqlBuilder.build(); // 去除order by 子句 - final int orderByIndex = StrUtil.indexOfIgnoreCase(selectSql, " order by"); + final int orderByIndex = StrUtil.lastIndexOfIgnoreCase(selectSql, " order by"); if (orderByIndex > 0) { selectSql = StrUtil.subPre(selectSql, orderByIndex); }