From 0e6464d3449fa6c239f8a26991ab2259d99b4aae Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 20 十月 2023 10:10:11 +0800
Subject: [PATCH] update springboot 3.1.4 => 3.1.5 update springboot 2.7.14 => 2.7.17(扩展服务) update poi 5.2.3 => 5.2.4 update satoken 1.36.0 => 1.37.0 update springboot-admin 3.1.6 => 3.1.7 update redisson 3.23.5 => 3.24.1
---
ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java
index 1f36f04..b2b74a0 100644
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java
@@ -182,12 +182,12 @@
* 鍒嗛〉鏌ヨVO
*/
default <C, P extends IPage<C>> P selectVoPage(IPage<T> page, Wrapper<T> wrapper, Class<C> voClass) {
- IPage<T> pageData = this.selectPage(page, wrapper);
- IPage<C> voPage = new Page<>(pageData.getCurrent(), pageData.getSize(), pageData.getTotal());
- if (CollUtil.isEmpty(pageData.getRecords())) {
+ List<T> list = this.selectList(page, wrapper);
+ IPage<C> voPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
+ if (CollUtil.isEmpty(list)) {
return (P) voPage;
}
- voPage.setRecords(MapstructUtils.convert(pageData.getRecords(), voClass));
+ voPage.setRecords(MapstructUtils.convert(list, voClass));
return (P) voPage;
}
--
Gitblit v1.9.3