版本

resource/WEB-INF/prop/hrmSalary.properties

@@ -1,5 +1,5 @@
 log=false
 defaultCloseNonStandard149=true
 AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
-version=3.0.2.2510.01.s
+version=3.0.3.2510.01.s
 openFormulaForcedEditing=false

src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java

@@ -505,7 +505,7 @@ public class CalculateFormulaVarBO {
         // 社保福利数据
         Map<String, List<FormulaVarValue>> 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<FormulaVarValue> 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<FormulaVarValue> 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()));
         }
     }