From f5561b8e7db29ad983cd2c7e94b092f3979b2487 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Mon, 23 May 2022 17:33:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5=E6=80=BB?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/organization/service/impl/CompServiceImpl.java  | 3 ++-
 .../organization/service/impl/DepartmentServiceImpl.java       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java
index 78d72c6c..22b1b10d 100644
--- a/src/com/engine/organization/service/impl/CompServiceImpl.java
+++ b/src/com/engine/organization/service/impl/CompServiceImpl.java
@@ -88,6 +88,7 @@ public class CompServiceImpl extends Service implements CompService {
         Map<String, Object> datas = new HashMap<>();
         PageUtil.start(params.getCurrent(), params.getPageSize());
         List<CompPO> parentList = getCompMapper().listParent();
+        PageInfo<CompPO> pageInfo = new PageInfo<>(parentList);
         List<CompPO> list = new ArrayList<>();
         list.addAll(parentList);
 
@@ -100,7 +101,7 @@ public class CompServiceImpl extends Service implements CompService {
 
         List<CompListDTO> compListDTOS = CompBO.buildCompDTOList(list, filterList);
         PageInfo<CompListDTO> pageInfos = new PageInfo<>(compListDTOS, CompListDTO.class);
-        pageInfos.setTotal(pageInfos.getTotal());
+        pageInfos.setTotal(pageInfo.getTotal());
         pageInfos.setPageNum(params.getCurrent());
         pageInfos.setPageSize(params.getPageSize());
 
diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java
index 3fdfca59..44c9a89d 100644
--- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java
+++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java
@@ -28,9 +28,10 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         //1.查询分部下所有部门
         PageUtil.start(param.getCurrent(),param.getPageSize());
         List<DepartmentPO> departmentPOS = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptListByCompId(param.getParentComp());
+        PageInfo<DepartmentPO> pageInfo = new PageInfo<>(departmentPOS);
         List<SingleDeptTreeVO> singleDeptTreeVOS = DepartmentBO.buildSingleDeptTreeVOS(departmentPOS);
         PageInfo<SingleDeptTreeVO> pageInfos = new PageInfo<>(singleDeptTreeVOS,SingleDeptTreeVO.class);
-        pageInfos.setTotal(departmentPOS.size());
+        pageInfos.setTotal(pageInfo.getTotal());
         pageInfos.setPageNum(param.getCurrent());
         pageInfos.setPageSize(param.getPageSize());