diff --git a/spring-boot-service-template-common/src/main/java/com/lanyuanxiaoyao/service/template/common/entity/Page.java b/spring-boot-service-template-common/src/main/java/com/lanyuanxiaoyao/service/template/common/entity/Page.java index 3026cb9..0018540 100644 --- a/spring-boot-service-template-common/src/main/java/com/lanyuanxiaoyao/service/template/common/entity/Page.java +++ b/spring-boot-service-template-common/src/main/java/com/lanyuanxiaoyao/service/template/common/entity/Page.java @@ -1,6 +1,6 @@ package com.lanyuanxiaoyao.service.template.common.entity; -import java.util.stream.Stream; +import java.util.List; /** * 分页数据封装类 @@ -27,5 +27,5 @@ import java.util.stream.Stream; * @param items 数据流,包含当前页的所有记录 * @param total 总记录数,用于计算总页数和显示分页信息 */ -public record Page(Stream items, long total) { +public record Page(List items, long total) { } diff --git a/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/controller/SimpleControllerSupport.java b/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/controller/SimpleControllerSupport.java index a790481..a000561 100644 --- a/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/controller/SimpleControllerSupport.java +++ b/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/controller/SimpleControllerSupport.java @@ -127,6 +127,7 @@ public abstract class SimpleControllerSupport { try { return mapper.apply(entity); diff --git a/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/service/SimpleServiceSupport.java b/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/service/SimpleServiceSupport.java index bec8969..dfd026e 100644 --- a/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/service/SimpleServiceSupport.java +++ b/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/service/SimpleServiceSupport.java @@ -201,7 +201,7 @@ public abstract class SimpleServiceSupport implemen }, pageRequest ); - return new Page<>(result.get(), result.getTotalElements()); + return new Page<>(result.get().toList(), result.getTotalElements()); } /**