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

continew-org · Aug 31, 2023 · 015ff55 · 015ff55
1 parent e18692f
commit 015ff55
Showing 1 changed file with 17 additions and 5 deletions.
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
@@ -70,7 +70,7 @@ public class PageDataVO<V> implements Serializable {
  */
  public static <T, V> PageDataVO<V> build(IPage<T> page, Class<V> targetClass) {
  if (null == page) {
- return null;
+ return empty();
  }
  PageDataVO<V> pageDataVO = new PageDataVO<>();
  pageDataVO.setList(BeanUtil.copyToList(page.getRecords(), targetClass));
@@ -89,7 +89,7 @@ public static <T, V> PageDataVO<V> build(IPage<T> page, Class<V> targetClass) {
  */
  public static <V> PageDataVO<V> build(IPage<V> page) {
  if (null == page) {
- return null;
+ return empty();
  }
  PageDataVO<V> pageDataVO = new PageDataVO<>();
  pageDataVO.setList(page.getRecords());
@@ -111,11 +111,10 @@ public static <V> PageDataVO<V> build(IPage<V> page) {
  * @return 分页信息
  */
  public static <V> PageDataVO<V> build(int page, int size, List<V> list) {
- PageDataVO<V> pageDataVO = new PageDataVO<>();
  if (CollUtil.isEmpty(list)) {
- return pageDataVO;
+ return empty();
  }
-
+ PageDataVO<V> pageDataVO = new PageDataVO<>();
  pageDataVO.setTotal(list.size());
  // 对列表数据进行分页
  int fromIndex = (page - 1) * size;
@@ -129,4 +128,17 @@ public static <V> PageDataVO<V> build(int page, int size, List<V> list) {
  }
  return pageDataVO;
  }
+
+ /**
+ * 空分页信息
+ *
+ * @param <V>
+ * 列表数据类型
+ * @return 分页信息
+ */
+ private static <V> PageDataVO<V> empty() {
+ PageDataVO<V> pageDataVO = new PageDataVO<>();
+ pageDataVO.setList(new ArrayList<>(0));
+ return pageDataVO;
+ }
 }