From 7c5fe9adaa602b26ef367adf0e0bff623ca27028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Fri, 14 Apr 2023 11:09:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/StaffLoginLogServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java
index f1a00216b5..af6b191963 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java
@@ -189,8 +189,8 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl<StaffLoginLogDao,
         if (formDTO.getIsPage()) {
             PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
             List<AccountActivityInfo> accountActivityInfos = baseDao.selectListActivityInfo(formDTO);
-            int total = CollectionUtils.isEmpty(accountActivityInfos) ? NumConstant.ZERO : accountActivityInfos.size();
-            return new PageData<>(accountActivityInfos, total);
+            PageInfo<AccountActivityInfo> pageInfo = new PageInfo<>(accountActivityInfos);
+            return new PageData<>(accountActivityInfos, pageInfo.getSize());
         }
         List<AccountActivityInfo> accountActivityInfos = baseDao.selectListActivityInfo(formDTO);
         int total = CollectionUtils.isEmpty(accountActivityInfos) ? NumConstant.ZERO : accountActivityInfos.size();