修改

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();
+            PageInfo<AccountActivityInfo> pageInfo = new PageInfo<>(accountActivityInfos);
-            return new PageData<>(accountActivityInfos, total);
+            return new PageData<>(accountActivityInfos, pageInfo.getSize());
         }
         List<AccountActivityInfo> accountActivityInfos = baseDao.selectListActivityInfo(formDTO);
         int total = CollectionUtils.isEmpty(accountActivityInfos) ? NumConstant.ZERO : accountActivityInfos.size();