diff --git a/backend/src/main/java/com/qqchen/deploy/backend/framework/query/BaseQuery.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/query/BaseQuery.java index 251f8716..157ec6ac 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/framework/query/BaseQuery.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/query/BaseQuery.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; @Data public abstract class BaseQuery implements Serializable { - private Integer pageNum = 1; + private Integer pageNum = 0; private Integer pageSize = 10; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/framework/service/impl/BaseServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/service/impl/BaseServiceImpl.java index 1c75d4d5..04168048 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/framework/service/impl/BaseServiceImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/service/impl/BaseServiceImpl.java @@ -330,8 +330,8 @@ public abstract class BaseServiceImpl, D extends BaseDTO, Q return PageRequest.of(0, 10, Sort.by(Sort.Direction.DESC, "createTime")); } - // 处理分页参数 - int pageNum = query.getPageNum() != null ? Math.max(1, query.getPageNum()) : 1; + // 处理分页参数(前端 pageNum 从 0 开始) + int pageNum = query.getPageNum() != null ? Math.max(0, query.getPageNum()) : 0; int pageSize = query.getPageSize() != null ? Math.max(1, Math.min(query.getPageSize(), 100)) : 10; // 处理排序 @@ -339,11 +339,7 @@ public abstract class BaseServiceImpl, D extends BaseDTO, Q Sort.by(Sort.Direction.fromString(query.getSortOrder()), query.getSortField()) : Sort.by(Sort.Direction.DESC, "createTime"); - return PageRequest.of( - pageNum - 1, // 转换为从0开始的页码 - pageSize, - sort - ); + return PageRequest.of(pageNum, pageSize, sort); } @Transactional(