qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/230902-账套中从公式改为输入，核算公式展示错误' into release/2.9.5.2309.01

This commit is contained in:
Harryxzy 2023-09-21 11:44:23 +08:00
parent ad6587b9b2 c40c31845c
commit 443368bdb3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
View File

@ -493,7 +493,7 @@ public class SalaryAcctResultBO {
Map<Long, String> resultValueMap,
Map<String, SalaryAcctResultListColumnDTO> 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("");