From d4a42e0ed68d8fecf84aba593df87200eb613b88 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 25 Dec 2024 11:27:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=BA=E5=91=98=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E9=A1=B5=E9=9D=A2=E2=80=9C=E7=8E=AF=E6=AF=94=E4=B8=8A?=
 =?UTF-8?q?=E6=9C=88=E5=87=8F=E5=B0=91=E4=BA=BA=E5=91=98=E2=80=9D=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=90=8E=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SalaryAcctEmployeeServiceImpl.java   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
index 3932486e6..6f0bbb2e2 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
@@ -297,12 +297,15 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
             return Collections.emptyList();
         }
         Set<Long> lastMonthSalaryAcctRecordIds = SalaryEntityUtil.properties(salaryAcctRecordPOS, SalaryAcctRecordPO::getId);
-        // 上个月的核算人员
-        List<SalaryAcctEmployeePO> lastMonthSalaryAcctEmployeePOS = listBySalaryAcctRecordIds(lastMonthSalaryAcctRecordIds);
-        Map<String, SalaryAcctEmployeePO> lastMonthSalaryAcctEmployeePOMap = SalaryEntityUtil.convert2Map(lastMonthSalaryAcctEmployeePOS, salaryAcctEmployeePO -> salaryAcctEmployeePO.getEmployeeId() + "-" + salaryAcctEmployeePO.getTaxAgentId());
         // 本月的核算人员
-        List<SalaryAcctEmployeePO> salaryAcctEmployeePOS = listByParam(queryParam);
+        List<SalaryAcctEmployeePO> salaryAcctEmployeePOS = listBySalaryAcctRecordId(queryParam.getSalaryAcctRecordId());
         Set<String> keySet = SalaryEntityUtil.properties(salaryAcctEmployeePOS, salaryAcctEmployeePO -> salaryAcctEmployeePO.getEmployeeId() + "-" + salaryAcctEmployeePO.getTaxAgentId());
+        // 上个月的核算人员
+        queryParam.setSalaryAcctRecordId(null);
+        queryParam.setSalaryAcctRecordIds(lastMonthSalaryAcctRecordIds);
+        List<SalaryAcctEmployeePO> lastMonthSalaryAcctEmployeePOS = listByParam(queryParam);
+        Map<String, SalaryAcctEmployeePO> lastMonthSalaryAcctEmployeePOMap = SalaryEntityUtil.convert2Map(lastMonthSalaryAcctEmployeePOS, salaryAcctEmployeePO -> salaryAcctEmployeePO.getEmployeeId() + "-" + salaryAcctEmployeePO.getTaxAgentId());
+
         List<SalaryAcctEmployeePO> resultList = Lists.newArrayList();
         if (CollectionUtils.isNotEmpty(keySet)) {
             lastMonthSalaryAcctEmployeePOMap.forEach((k, v) -> {