diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/base/mapper/MPJJoinMapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/base/mapper/MPJJoinMapper.java index 436dfa6..42627d8 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/base/mapper/MPJJoinMapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/base/mapper/MPJJoinMapper.java @@ -21,7 +21,7 @@ public interface MPJJoinMapper extends BaseMapper { * * @param wrapper joinWrapper */ - Integer selectJoinCount(@Param(Constants.WRAPPER) MPJBaseJoin wrapper); + Long selectJoinCount(@Param(Constants.WRAPPER) MPJBaseJoin wrapper); /** * 连表查询返回一条记录 @@ -62,15 +62,15 @@ public interface MPJJoinMapper extends BaseMapper { * @param clazz resultType * @param 分页返回对象 */ - > IPage selectJoinPage(P page, - @Param(Constant.CLAZZ) Class clazz, - @Param(Constants.WRAPPER) MPJBaseJoin wrapper); + > P selectJoinPage(P page, + @Param(Constant.CLAZZ) Class clazz, + @Param(Constants.WRAPPER) MPJBaseJoin wrapper); /** * 连表查询返回Map集合并分页 * * @param wrapper joinWrapper */ -

> IPage> selectJoinMapsPage(P page, - @Param(Constants.WRAPPER) MPJBaseJoin wrapper); +

>> P selectJoinMapsPage(P page, + @Param(Constants.WRAPPER) MPJBaseJoin wrapper); } diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/base/service/MPJJoinService.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/base/service/MPJJoinService.java index a58d63f..08e8d9d 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/base/service/MPJJoinService.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/base/service/MPJJoinService.java @@ -18,7 +18,7 @@ public interface MPJJoinService extends IService { /** * 根据 Wrapper 条件,查询总记录数 */ - default Integer selectJoinCount(MPJBaseJoin wrapper) { + default Long selectJoinCount(MPJBaseJoin wrapper) { return ((MPJBaseMapper) getBaseMapper()).selectJoinCount(wrapper); } @@ -39,7 +39,7 @@ public interface MPJJoinService extends IService { /** * 连接查询返回集合并分页 */ - default > IPage selectJoinListPage(P page, Class clazz, MPJBaseJoin wrapper) { + default > P selectJoinListPage(P page, Class clazz, MPJBaseJoin wrapper) { return ((MPJBaseMapper) getBaseMapper()).selectJoinPage(page, clazz, wrapper); } @@ -60,8 +60,7 @@ public interface MPJJoinService extends IService { /** * 连接查询返回Map集合并分页 */ - default

>> IPage> selectJoinMapsPage( - P page, MPJBaseJoin wrapper) { + default

>> P selectJoinMapsPage(P page, MPJBaseJoin wrapper) { return ((MPJBaseMapper) getBaseMapper()).selectJoinMapsPage(page, wrapper); } } diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java index 5c7c82d..184973f 100644 --- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java +++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java @@ -519,7 +519,7 @@ class LambdaWrapperTest { */ @Test void test1() { - Page page = new Page<>(1, 10); + Page page = new Page<>(1, 10); page.setSearchCount(false); IPage iPage = userMapper.selectJoinPage(page, UserDTO.class, MPJWrappers.lambdaJoin() @@ -594,7 +594,7 @@ class LambdaWrapperTest { .select(AddressDO.class, p -> true) .leftJoin(AddressDO.class, AddressDO::getUserId, UserDO::getId) .eq(UserDO::getId, 1); - IPage page = userMapper.selectJoinPage(new Page<>(1, 10), UserDTO.class, wrapper); + Page page = userMapper.selectJoinPage(new Page<>(1, 10), UserDTO.class, wrapper); assert page.getRecords().get(0).getAddress() != null; page.getRecords().forEach(System.out::println); }