From edae6a5b6b0fe970929b06e4a14cc6ce44e4026a Mon Sep 17 00:00:00 2001 From: xiarigang <272227118@qq.com> Date: Wed, 27 Aug 2025 20:39:15 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E9=80=82=E9=85=8D=20WarmFlow1.8.1?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +++--- warm-flow-mybatis-flex-core/pom.xml | 2 +- .../java/org/dromara/warm/flow/orm/dao/WarmDaoImpl.java | 5 ++++- warm-flow-mybatis-flex-sb-starter/pom.xml | 2 +- warm-flow-mybatis-flex-sb3-starter/pom.xml | 2 +- warm-flow-mybatis-flex-solon-plugin/pom.xml | 2 +- warm-flow-mybatis-flex-test/pom.xml | 2 +- .../warm-flow-mybatis-flex-core-test/pom.xml | 2 +- .../warm-flow-mybatis-flex-sb-test/pom.xml | 2 +- .../warm-flow-mybatis-flex-solon-test/pom.xml | 2 +- 10 files changed, 15 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 95cc769..dc83956 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.dromara.warm-flow-mybatis-flex warm-flow-mybatis-flex - 1.8.0 + 1.8.1 pom warm-flow-mybatis-flex @@ -43,8 +43,8 @@ - 1.8.0 - 1.8.0 + 1.8.1 + 1.8.1 8 diff --git a/warm-flow-mybatis-flex-core/pom.xml b/warm-flow-mybatis-flex-core/pom.xml index ee9efb7..54c9a24 100644 --- a/warm-flow-mybatis-flex-core/pom.xml +++ b/warm-flow-mybatis-flex-core/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm-flow-mybatis-flex warm-flow-mybatis-flex - 1.8.0 + 1.8.1 warm-flow-mybatis-flex-core diff --git a/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/dao/WarmDaoImpl.java b/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/dao/WarmDaoImpl.java index d487c6b..804bac5 100644 --- a/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/dao/WarmDaoImpl.java +++ b/warm-flow-mybatis-flex-core/src/main/java/org/dromara/warm/flow/orm/dao/WarmDaoImpl.java @@ -77,7 +77,10 @@ public abstract class WarmDaoImpl implements WarmDao { } pageFlex = getMapper().paginate(pageFlex, queryWrapper); if (ObjectUtil.isNotNull(pageFlex)) { - return new Page<>(pageFlex.getRecords(), pageFlex.getTotalRow()); + Page tPage = new Page<>(pageFlex.getRecords(), pageFlex.getTotalRow()); + tPage.setPageNum(page.getPageNum()); + tPage.setPageSize(page.getPageSize()); + return tPage; } return Page.empty(); } diff --git a/warm-flow-mybatis-flex-sb-starter/pom.xml b/warm-flow-mybatis-flex-sb-starter/pom.xml index dab9a5c..643570c 100644 --- a/warm-flow-mybatis-flex-sb-starter/pom.xml +++ b/warm-flow-mybatis-flex-sb-starter/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm-flow-mybatis-flex warm-flow-mybatis-flex - 1.8.0 + 1.8.1 warm-flow-mybatis-flex-sb-starter diff --git a/warm-flow-mybatis-flex-sb3-starter/pom.xml b/warm-flow-mybatis-flex-sb3-starter/pom.xml index 37d8780..69ec1ae 100644 --- a/warm-flow-mybatis-flex-sb3-starter/pom.xml +++ b/warm-flow-mybatis-flex-sb3-starter/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm-flow-mybatis-flex warm-flow-mybatis-flex - 1.8.0 + 1.8.1 warm-flow-mybatis-flex-sb3-starter diff --git a/warm-flow-mybatis-flex-solon-plugin/pom.xml b/warm-flow-mybatis-flex-solon-plugin/pom.xml index a4afa56..3c1f111 100644 --- a/warm-flow-mybatis-flex-solon-plugin/pom.xml +++ b/warm-flow-mybatis-flex-solon-plugin/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm-flow-mybatis-flex warm-flow-mybatis-flex - 1.8.0 + 1.8.1 warm-flow-mybatis-flex-solon-plugin diff --git a/warm-flow-mybatis-flex-test/pom.xml b/warm-flow-mybatis-flex-test/pom.xml index 3599187..4a870bf 100644 --- a/warm-flow-mybatis-flex-test/pom.xml +++ b/warm-flow-mybatis-flex-test/pom.xml @@ -7,7 +7,7 @@ org.dromara.warm-flow-mybatis-flex warm-flow-mybatis-flex - 1.8.0 + 1.8.1 warm-flow-mybatis-flex-test diff --git a/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-core-test/pom.xml b/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-core-test/pom.xml index c031af9..dcf4760 100644 --- a/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-core-test/pom.xml +++ b/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-core-test/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm-flow-mybatis-flex warm-flow-mybatis-flex-test - 1.8.0 + 1.8.1 warm-flow-mybatis-flex-core-test diff --git a/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-sb-test/pom.xml b/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-sb-test/pom.xml index 270d187..60639b6 100644 --- a/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-sb-test/pom.xml +++ b/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-sb-test/pom.xml @@ -5,7 +5,7 @@ org.dromara.warm-flow-mybatis-flex warm-flow-mybatis-flex-test - 1.8.0 + 1.8.1 warm-flow-mybatis-flex-sb-test diff --git a/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-solon-test/pom.xml b/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-solon-test/pom.xml index 819a479..0741ba1 100644 --- a/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-solon-test/pom.xml +++ b/warm-flow-mybatis-flex-test/warm-flow-mybatis-flex-solon-test/pom.xml @@ -7,7 +7,7 @@ org.dromara.warm-flow-mybatis-flex warm-flow-mybatis-flex-test - 1.8.0 + 1.8.1 warm-flow-mybatis-flex-solon-test -- Gitee