增加构建通知
This commit is contained in:
parent
f2d4fd75e4
commit
ba9192e8bb
@ -10,7 +10,7 @@ import java.time.LocalDateTime;
|
|||||||
@Data
|
@Data
|
||||||
public abstract class BaseQuery implements Serializable {
|
public abstract class BaseQuery implements Serializable {
|
||||||
|
|
||||||
private Integer pageNum = 1;
|
private Integer pageNum = 0;
|
||||||
|
|
||||||
private Integer pageSize = 10;
|
private Integer pageSize = 10;
|
||||||
|
|
||||||
|
|||||||
@ -330,8 +330,8 @@ public abstract class BaseServiceImpl<T extends Entity<ID>, D extends BaseDTO, Q
|
|||||||
return PageRequest.of(0, 10, Sort.by(Sort.Direction.DESC, "createTime"));
|
return PageRequest.of(0, 10, Sort.by(Sort.Direction.DESC, "createTime"));
|
||||||
}
|
}
|
||||||
|
|
||||||
// 处理分页参数
|
// 处理分页参数(前端 pageNum 从 0 开始)
|
||||||
int pageNum = query.getPageNum() != null ? Math.max(1, query.getPageNum()) : 1;
|
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;
|
int pageSize = query.getPageSize() != null ? Math.max(1, Math.min(query.getPageSize(), 100)) : 10;
|
||||||
|
|
||||||
// 处理排序
|
// 处理排序
|
||||||
@ -339,11 +339,7 @@ public abstract class BaseServiceImpl<T extends Entity<ID>, D extends BaseDTO, Q
|
|||||||
Sort.by(Sort.Direction.fromString(query.getSortOrder()), query.getSortField()) :
|
Sort.by(Sort.Direction.fromString(query.getSortOrder()), query.getSortField()) :
|
||||||
Sort.by(Sort.Direction.DESC, "createTime");
|
Sort.by(Sort.Direction.DESC, "createTime");
|
||||||
|
|
||||||
return PageRequest.of(
|
return PageRequest.of(pageNum, pageSize, sort);
|
||||||
pageNum - 1, // 转换为从0开始的页码
|
|
||||||
pageSize,
|
|
||||||
sort
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional(
|
@Transactional(
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user