zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
tangwei 2026-06-11 13:08:07 +08:00
parent 1ea183c607
commit b083dd7019
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
backend/src/main/java/com/yfd/platform/utils/DataSourceRequestUtil.java
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_]*)*$"); 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) { public static <T> Page<T> getPage(DataSourceRequest request) {
if (request == null) { if (request == null) {
return null; return null;
} }
int take = request.getTake(); int pageNum = request.getSkip(); // 前端传的页码（从1开始）
int skip = request.getSkip(); int pageSize = request.getTake(); // 每页条数
if (take <= 0) {
return null; if (pageSize <= 0) {
return null; // 或 throw new IllegalArgumentException("每页条数必须大于0")
} }
if (pageNum < 1) {
pageNum = 1; // 页码最小为1
}
Page<T> page = new Page<>(); Page<T> page = new Page<>();
page.setSize((long) take); page.setSize((long) pageSize);
page.setCurrent(skip / take + 1L); page.setCurrent(pageNum); // 直接使用页码
return page; return page;
} }