wol/AgileBoot-Back-End
2
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #60 from burningimlam/main

Browse Source 
fix: 分页查询时可能出现的NPE
This commit is contained in:
valarchie
2023-11-08 19:32:42 +08:00
committed by GitHub
parent e9df8f01a1 aa2de6a6f2
commit 4716b3c977
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
agileboot-common/src/main/java/com/agileboot/common/core/page/AbstractPageQuery.java
View File

@@ -1,11 +1,11 @@
package com.agileboot.common.core.page;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import javax.validation.constraints.Max;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.Max;
/**
* @author valarchie
*/
@@ -13,15 +13,31 @@ import javax.validation.constraints.Max;
@Data
public abstract class AbstractPageQuery<T> extends AbstractQuery<T> {
/**
* 最大分页页数
*/
public static final int MAX_PAGE_NUM = 200;
/**
* 单页最大大小
*/
public static final int MAX_PAGE_SIZE = 500;
/**
* 默认分页页数
*/
public static final int DEFAULT_PAGE_NUM = 1;
/**
* 默认分页大小
*/
public static final int DEFAULT_PAGE_SIZE = 10;
@Max(MAX_PAGE_NUM)
protected Integer pageNum = 1;
protected Integer pageNum;
@Max(MAX_PAGE_SIZE)
protected Integer pageSize = 10;
protected Integer pageSize;
public Page<T> toPage() {
pageNum = ObjectUtil.defaultIfNull(pageNum, DEFAULT_PAGE_NUM);
pageSize = ObjectUtil.defaultIfNull(pageSize, DEFAULT_PAGE_SIZE);
return new Page<>(pageNum, pageSize);
}