zayac/zayac-admin
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复在线用户列表等自定义分页查询 NPE 的问题

Browse Source
This commit is contained in:
Charles7c 2023-09-01 00:35:43 +08:00
parent e18692fa74
commit 015ff5512b
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/PageDataVO.java
View File

@ -70,7 +70,7 @@ public class PageDataVO<V> implements Serializable {
*/ */
public static <T, V> PageDataVO<V> build(IPage<T> page, Class<V> targetClass) { public static <T, V> PageDataVO<V> build(IPage<T> page, Class<V> targetClass) {
if (null == page) { if (null == page) {
return null; return empty();
} }
PageDataVO<V> pageDataVO = new PageDataVO<>(); PageDataVO<V> pageDataVO = new PageDataVO<>();
pageDataVO.setList(BeanUtil.copyToList(page.getRecords(), targetClass)); pageDataVO.setList(BeanUtil.copyToList(page.getRecords(), targetClass));
@ -89,7 +89,7 @@ public class PageDataVO<V> implements Serializable {
*/ */
public static <V> PageDataVO<V> build(IPage<V> page) { public static <V> PageDataVO<V> build(IPage<V> page) {
if (null == page) { if (null == page) {
return null; return empty();
} }
PageDataVO<V> pageDataVO = new PageDataVO<>(); PageDataVO<V> pageDataVO = new PageDataVO<>();
pageDataVO.setList(page.getRecords()); pageDataVO.setList(page.getRecords());
@ -111,11 +111,10 @@ public class PageDataVO<V> implements Serializable {
* @return 分页信息 * @return 分页信息
*/ */
public static <V> PageDataVO<V> build(int page, int size, List<V> list) { public static <V> PageDataVO<V> build(int page, int size, List<V> list) {
PageDataVO<V> pageDataVO = new PageDataVO<>();
if (CollUtil.isEmpty(list)) { if (CollUtil.isEmpty(list)) {
return pageDataVO; return empty();
} }
PageDataVO<V> pageDataVO = new PageDataVO<>();
pageDataVO.setTotal(list.size()); pageDataVO.setTotal(list.size());
// 对列表数据进行分页 // 对列表数据进行分页
int fromIndex = (page - 1) * size; int fromIndex = (page - 1) * size;
@ -129,4 +128,17 @@ public class PageDataVO<V> implements Serializable {
} }
return pageDataVO; return pageDataVO;
} }
/**
* 空分页信息
*
* @param <V>
* 列表数据类型
* @return 分页信息
*/
private static <V> PageDataVO<V> empty() {
PageDataVO<V> pageDataVO = new PageDataVO<>();
pageDataVO.setList(new ArrayList<>(0));
return pageDataVO;
}
} }