From 015ff5512b3662efce88d02ab1dda6d55501a501 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Fri, 1 Sep 2023 00:35:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E7=AD=89=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=20NPE=20=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cnadmin/common/model/vo/PageDataVO.java   | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 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
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<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 class PageDataVO<V> implements Serializable {
      */
     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 class PageDataVO<V> implements Serializable {
      * @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 class PageDataVO<V> implements Serializable {
         }
         return pageDataVO;
     }
+
+    /**
+     * 空分页信息
+     *
+     * @param <V>
+     *            列表数据类型
+     * @return 分页信息
+     */
+    private static <V> PageDataVO<V> empty() {
+        PageDataVO<V> pageDataVO = new PageDataVO<>();
+        pageDataVO.setList(new ArrayList<>(0));
+        return pageDataVO;
+    }
 }