diff --git a/pom.xml b/pom.xml index 95cc769efc6af2a8b8f24671f7f44d12944d1566..dc83956c63dbaec5f73d3512ec0bf993bacc7dd9 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 ee9efb7e6c85e2c7e79ef5f2048fcc8d07f60d7b..54c9a244d3e31d3c311a907806d6034235adc2fb 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 d487c6b0b781211ba37687c02a39b3c7bfa0f51b..804bac5fa2c9da9e44bbdd9429fb10c759b3fe84 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 dab9a5ce031e95282944ac168897d0cbbe322e63..643570cfca66a459d61ee759732c9408a3690557 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 37d878080890c2a79d1cabf1824e9fa75d5511da..69ec1aef27c9d491db1450c5fac706709c5f50ae 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 a4afa5619464731064f0d7cfab62257add98ad9b..3c1f111bee09625deb6279a3d4575166050b3625 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 359918749160d85a01079675fa960551f52951fb..4a870bf43307911f60eea731a607637697a92195 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 c031af9f2b0502ab8a86e9184d3ed21f981a3a4f..dcf47604537ba310dd7964e057cf711605923a4e 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 270d187a2dc908c247966d245ccd273c5a47afc1..60639b63b501f33fde6b446eefa8f94824625e98 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 819a479c0a786939550c474296066db0d306c8de..0741ba1e03ebc8451227d28ce0b1ba427062742c 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