From 2b9fb67cd00aacc9d4aa3b835e4b378e93cab12d Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 23 Apr 2020 09:14:31 +0800 Subject: [PATCH] fix Page bug --- CHANGELOG.md | 1 + hutool-db/src/main/java/cn/hutool/db/Page.java | 5 +---- .../src/test/java/cn/hutool/db/PageTest.java | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 hutool-db/src/test/java/cn/hutool/db/PageTest.java diff --git a/CHANGELOG.md b/CHANGELOG.md index a8cbbb3c0..4c21fb561 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ ### Bug修复 * 【db 】 修复PageResult.isLast计算问题 * 【cron 】 修复更改系统时间后CronTimer被阻塞的问题(issue#838@Github) +* 【db 】 修复Page.addOrder无效问题(issue#838@Github) ------------------------------------------------------------------------------------------------------------- ## 5.3.1 (2020-04-17) diff --git a/hutool-db/src/main/java/cn/hutool/db/Page.java b/hutool-db/src/main/java/cn/hutool/db/Page.java index 39bc195a1..d53b6bc99 100644 --- a/hutool-db/src/main/java/cn/hutool/db/Page.java +++ b/hutool-db/src/main/java/cn/hutool/db/Page.java @@ -134,10 +134,7 @@ public class Page implements Serializable { * @param orders 排序 */ public void addOrder(Order... orders) { - if (null != this.orders) { - ArrayUtil.append(this.orders, orders); - } - this.orders = orders; + this.orders = ArrayUtil.append(this.orders, orders); } // ---------------------------------------------------------- Getters and Setters end diff --git a/hutool-db/src/test/java/cn/hutool/db/PageTest.java b/hutool-db/src/test/java/cn/hutool/db/PageTest.java new file mode 100644 index 000000000..7c7ca116e --- /dev/null +++ b/hutool-db/src/test/java/cn/hutool/db/PageTest.java @@ -0,0 +1,17 @@ +package cn.hutool.db; + +import cn.hutool.db.sql.Order; +import org.junit.Assert; +import org.junit.Test; + +public class PageTest { + + @Test + public void addOrderTest() { + Page page = new Page(); + page.addOrder(new Order("aaa")); + Assert.assertEquals(page.getOrders().length, 1); + page.addOrder(new Order("aaa")); + Assert.assertEquals(page.getOrders().length, 2); + } +}