diff --git a/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/factory/PageResultFactory.java b/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/factory/PageResultFactory.java index 32c5ddb49..096c71eeb 100644 --- a/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/factory/PageResultFactory.java +++ b/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/factory/PageResultFactory.java @@ -5,6 +5,8 @@ import cn.hutool.core.util.PageUtil; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; + /** * 分页的返回结果创建工厂 *
@@ -28,7 +30,23 @@ public class PageResultFactory {
pageResult.setPageNo(Convert.toInt(page.getCurrent()));
pageResult.setPageSize(Convert.toInt(page.getSize()));
pageResult.setTotalPage(
- PageUtil.totalPage(Convert.toInt(page.getTotal()), Convert.toInt(page.getSize())));
+ PageUtil.totalPage(pageResult.getTotalRows(), pageResult.getPageSize()));
+ return pageResult;
+ }
+
+ /**
+ * 将mybatis-plus的page转成自定义的PageResult,扩展了totalPage总页数
+ *
+ * @author fengshuonan
+ * @date 2020/10/15 15:53
+ */
+ public static