diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java index 0a8539ad6..20b05d82f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java @@ -180,12 +180,12 @@ public interface BaseMapperPlus extends BaseMapper { * 分页查询VO */ default > P selectVoPage(IPage page, Wrapper wrapper, Class voClass) { - IPage pageData = this.selectPage(page, wrapper); - IPage voPage = new Page<>(pageData.getCurrent(), pageData.getSize(), pageData.getTotal()); - if (CollUtil.isEmpty(pageData.getRecords())) { + List list = this.selectList(page, wrapper); + IPage voPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); + if (CollUtil.isEmpty(list)) { return (P) voPage; } - voPage.setRecords(BeanCopyUtils.copyList(pageData.getRecords(), voClass)); + voPage.setRecords(BeanCopyUtils.copyList(list, voClass)); return (P) voPage; } diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java index 11a3d50e2..6d3a47fe7 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java @@ -33,7 +33,7 @@ public interface TestDemoMapper extends BaseMapperPlus> P selectPage(P page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + List selectList(IPage page, @Param(Constants.WRAPPER) Wrapper queryWrapper); @Override @DataPermission({