From c40c31845c65bbae2043a85c0729fc6985520064 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 20 Sep 2023 15:26:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=A5=97=E4=B8=AD=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=85=AC=E5=BC=8F=E4=B8=BA=E8=BE=93=E5=85=A5=EF=BC=8C=E6=A0=B8?= =?UTF-8?q?=E7=AE=97=E7=9A=84=E5=85=AC=E5=BC=8F=E9=A1=B5=E9=9D=A2=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E4=B8=BA=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E4=B8=8D?= =?UTF-8?q?=E6=98=AF=E2=80=9D=E8=BE=93=E5=85=A5=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java index 73558cd0b..d811aee21 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java @@ -493,7 +493,7 @@ public class SalaryAcctResultBO { Map resultValueMap, Map formulaContentMap) { - SalaryValueTypeEnum salaryValueTypeEnum = SalaryValueTypeEnum.parseByValue(Optional.ofNullable(salaryItemPO).map(SalaryItemPO::getValueType).orElse(0)); + SalaryValueTypeEnum salaryValueTypeEnum = SalaryValueTypeEnum.parseByValue(Optional.ofNullable(salarySobItemPO).map(SalarySobItemPO::getValueType).orElse(0)); String itemFormulaContent; if(Objects.equals(salaryValueTypeEnum.getValue(),SalaryValueTypeEnum.FORMULA.getValue())){ itemFormulaContent = Optional.ofNullable(formulaContentMap.get(salarySobItemPO.getSalaryItemId().toString())).map(SalaryAcctResultListColumnDTO::getFormulaContent).orElse("");