Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01

修复生成年终奖申报表null
2025-11-28 17:48:21 +08:00 · 2025-11-28 15:41:42 +08:00
1 changed files with 1 additions and 0 deletions
--- a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
+++ b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
@ -723,6 +723,7 @@ public class TaxDeclarationBO {
    private static String findStringValue(String fieldCode, Map<Long, List<SalaryAcctResultPO>> resultMap, Map<String, Long> salaryItemMap) {
        return resultMap.getOrDefault(salaryItemMap.getOrDefault(fieldCode, 0L), Collections.emptyList()).stream()
                .map(SalaryAcctResultPO::getResultValue)
+                .filter(Objects::nonNull)
                .findFirst().orElse("");
    }
Author	SHA1	Message	Date
钱涛	d1abbad832	Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01	2025-11-28 17:48:21 +08:00
钱涛	00fc87ffd8	修复生成年终奖申报表null	2025-11-28 15:41:42 +08:00