From b4dfe2c740b76ed80f7e94d0cc6893c638c12d99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 16 Dec 2025 16:22:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=B1=87=E9=80=9A=E7=9A=84?= =?UTF-8?q?=E4=BA=8C=E5=BC=80=EF=BC=8C=E7=A4=BE=E4=BF=9D=E8=83=BD=E8=B7=A8?= =?UTF-8?q?=E6=89=A3=E7=BC=B4=E4=B9=89=E5=8A=A1=E4=BA=BA=E6=A0=B8=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/salaryacct/bo/CalculateFormulaVarBO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java b/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java index cd66dd76c..ae72d0f4a 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java @@ -505,7 +505,7 @@ public class CalculateFormulaVarBO { // 社保福利数据 Map> tempMap = new HashMap<>(); welfareData.forEach(map -> { - String key = map.getOrDefault("employeeId", StringUtils.EMPTY) + "_" + map.getOrDefault("taxAgentId", StringUtils.EMPTY); + String key = String.valueOf(map.getOrDefault("employeeId", StringUtils.EMPTY)); List formulaVarValues = tempMap.computeIfAbsent(key, k -> Lists.newArrayList()); formulaVarValues.addAll(fieldNames.stream().map(fieldName -> { String fieldId = SalaryFormulaReferenceEnum.WELFARE.getValue() @@ -518,7 +518,7 @@ public class CalculateFormulaVarBO { for (SalaryAcctEmployeePO salaryAcctEmployeePO : salaryAcctCalculateBO.getSalaryAcctEmployeePOS()) { List formulaVarValues = resultMap.computeIfAbsent(salaryAcctEmployeePO.getEmployeeId() + "_" + salaryAcctEmployeePO.getTaxAgentId(), k -> Lists.newArrayList()); - formulaVarValues.addAll(tempMap.getOrDefault(salaryAcctEmployeePO.getEmployeeId() + "_" + salaryAcctEmployeePO.getTaxAgentId(), Collections.emptyList())); + formulaVarValues.addAll(tempMap.getOrDefault(String.valueOf(salaryAcctEmployeePO.getEmployeeId()), Collections.emptyList())); } }