From 22cb95d1d3ab7c0277abce7981a7d6b64e745f16 Mon Sep 17 00:00:00 2001
From: 176yunxuan <362612387@qq.com~>
Date: Wed, 17 Apr 2024 10:53:25 +0800
Subject: [PATCH] =?UTF-8?q?bug:=E6=B6=88=E6=81=AF=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=A2=9E=E5=8A=A0=E6=80=BB=E6=95=B0=E7=AD=89?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .run/oa [clean,spring-boot_run].run.xml         | 17 ++++++++++++++++-
 .../java/com/jsl/oa/model/vodata/PageBean.java  | 17 +++++++++++++++++
 .../oa/services/impl/MessageServiceImpl.java    |  9 ++++++++-
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/jsl/oa/model/vodata/PageBean.java

diff --git a/.run/oa [clean,spring-boot_run].run.xml b/.run/oa [clean,spring-boot_run].run.xml
index afe71aa..febc511 100644
--- a/.run/oa [clean,spring-boot_run].run.xml	
+++ b/.run/oa [clean,spring-boot_run].run.xml	
@@ -2,7 +2,22 @@
   <configuration default="false" name="oa [clean,spring-boot:run]" type="MavenRunConfiguration" factoryName="Maven" nameIsGenerated="true">
     <MavenSettings>
       <option name="myGeneralSettings" />
-      <option name="myRunnerSettings" />
+      <option name="myRunnerSettings">
+        <MavenRunnerSettings>
+          <option name="delegateBuildToMaven" value="false" />
+          <option name="environmentProperties">
+            <map />
+          </option>
+          <option name="jreName" value="corretto-17" />
+          <option name="mavenProperties">
+            <map />
+          </option>
+          <option name="passParentEnv" value="true" />
+          <option name="runMavenInBackground" value="true" />
+          <option name="skipTests" value="false" />
+          <option name="vmOptions" value="-Dfile.encoding=GB2312" />
+        </MavenRunnerSettings>
+      </option>
       <option name="myRunnerParameters">
         <MavenRunnerParameters>
           <option name="cmdOptions" />
diff --git a/src/main/java/com/jsl/oa/model/vodata/PageBean.java b/src/main/java/com/jsl/oa/model/vodata/PageBean.java
new file mode 100644
index 0000000..0d7ae35
--- /dev/null
+++ b/src/main/java/com/jsl/oa/model/vodata/PageBean.java
@@ -0,0 +1,17 @@
+package com.jsl.oa.model.vodata;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PageBean<T> {
+    private int totalCount; // 总记录数
+    private int currentPage; // 当前页码
+    private int pageSize; // 每页记录数
+    private List<T> list; // 当前页的数据列表
+}
diff --git a/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java
index 2337ac5..59c4bcb 100644
--- a/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java
@@ -7,6 +7,7 @@ import com.jsl.oa.model.dodata.ProjectChildDO;
 import com.jsl.oa.model.dodata.ProjectModuleDO;
 import com.jsl.oa.model.vodata.MessageAddVO;
 import com.jsl.oa.model.vodata.MessageGetVO;
+import com.jsl.oa.model.vodata.PageBean;
 import com.jsl.oa.services.MessageService;
 import com.jsl.oa.utils.*;
 import lombok.RequiredArgsConstructor;
@@ -86,12 +87,18 @@ public class MessageServiceImpl implements MessageService {
             }
             messageGetVOList.add(messageGetVO1);
         }
+
         //分页返回
         int start = (page - 1) * pageSize;
         int end = start + pageSize;
         List<MessageGetVO> pageData = messageGetVOList.subList(start,
                 Math.min(end, messageGetVOList.size()));
-        return ResultUtil.success(pageData);
+        PageBean<MessageGetVO> pageBean = new PageBean<>();
+        pageBean.setTotalCount(messageGetVOList.size());
+        pageBean.setCurrentPage(page);
+        pageBean.setPageSize(pageSize);
+        pageBean.setList(pageData);
+        return ResultUtil.success(pageBean);
     }
 
     /**