From 2b8e4cbfe24231e9323c7552edd45d557ea8de37 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 11 Jun 2024 16:46:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=82=E7=AB=8B=EF=BC=8C=E8=96=AA=E9=85=AC?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=BA=E5=91=98=E9=9C=80=E6=B1=82=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/wrapper/SalaryAcctEmployeeWrapper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/wrapper/SalaryAcctEmployeeWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctEmployeeWrapper.java index 04fd10324..2ee394d29 100644 --- a/src/com/engine/salary/wrapper/SalaryAcctEmployeeWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryAcctEmployeeWrapper.java @@ -20,6 +20,7 @@ import com.engine.salary.service.impl.SalaryEmployeeServiceImpl; import com.engine.salary.service.impl.TaxAgentServiceImpl; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.page.PageInfo; +import com.engine.salary.util.page.SalaryPageUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.math.NumberUtils; import weaver.hrm.User; @@ -114,7 +115,7 @@ public class SalaryAcctEmployeeWrapper extends Service { private PageInfo convert2ListDTO(PageInfo page) { List list = page.getList(); if (CollectionUtils.isEmpty(list)) { - return new PageInfo<>(SalaryAccEmployeeListDTO.class); + return SalaryPageUtil.buildPage(page.getPageNum(), page.getPageSize(), SalaryAccEmployeeListDTO.class); } // 查询人员信息 List employeeIds = list.stream().map(SalaryAcctEmployeePO::getEmployeeId).collect(Collectors.toList());