fix: 优化过鱼审批页面分页

This commit is contained in:
tangwei 2026-06-11 13:08:07 +08:00
parent 1ea183c607
commit b083dd7019

View File

@ -18,18 +18,39 @@ public class DataSourceRequestUtil {
private static final Pattern SAFE_IDENTIFIER = Pattern.compile("^[A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*$");
// public static <T> Page<T> getPage(DataSourceRequest request) {
// if (request == null) {
// return null;
// }
// int take = request.getTake();
// int skip = request.getSkip();
// if (take <= 0) {
// return null;
// }
// Page<T> page = new Page<>();
// page.setSize((long) take);
// page.setCurrent(skip / take + 1L);
// return page;
// }
public static <T> Page<T> getPage(DataSourceRequest request) {
if (request == null) {
return null;
}
int take = request.getTake();
int skip = request.getSkip();
if (take <= 0) {
return null;
int pageNum = request.getSkip(); // 前端传的页码从1开始
int pageSize = request.getTake(); // 每页条数
if (pageSize <= 0) {
return null; // throw new IllegalArgumentException("每页条数必须大于0")
}
if (pageNum < 1) {
pageNum = 1; // 页码最小为1
}
Page<T> page = new Page<>();
page.setSize((long) take);
page.setCurrent(skip / take + 1L);
page.setSize((long) pageSize);
page.setCurrent(pageNum); // 直接使用页码
return page;
}