diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/PageDataVO.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/PageDataVO.java index 7716e112..f455497e 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/PageDataVO.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/PageDataVO.java @@ -70,7 +70,7 @@ public class PageDataVO implements Serializable { */ public static PageDataVO build(IPage page, Class targetClass) { if (null == page) { - return null; + return empty(); } PageDataVO pageDataVO = new PageDataVO<>(); pageDataVO.setList(BeanUtil.copyToList(page.getRecords(), targetClass)); @@ -89,7 +89,7 @@ public class PageDataVO implements Serializable { */ public static PageDataVO build(IPage page) { if (null == page) { - return null; + return empty(); } PageDataVO pageDataVO = new PageDataVO<>(); pageDataVO.setList(page.getRecords()); @@ -111,11 +111,10 @@ public class PageDataVO implements Serializable { * @return 分页信息 */ public static PageDataVO build(int page, int size, List list) { - PageDataVO pageDataVO = new PageDataVO<>(); if (CollUtil.isEmpty(list)) { - return pageDataVO; + return empty(); } - + PageDataVO pageDataVO = new PageDataVO<>(); pageDataVO.setTotal(list.size()); // 对列表数据进行分页 int fromIndex = (page - 1) * size; @@ -129,4 +128,17 @@ public class PageDataVO implements Serializable { } return pageDataVO; } + + /** + * 空分页信息 + * + * @param + * 列表数据类型 + * @return 分页信息 + */ + private static PageDataVO empty() { + PageDataVO pageDataVO = new PageDataVO<>(); + pageDataVO.setList(new ArrayList<>(0)); + return pageDataVO; + } }