Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01

fix邮件中数据为null
2025-05-27 15:57:28 +08:00 · 2025-05-27 15:56:33 +08:00
1 changed files with 2 additions and 2 deletions
--- a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
+++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
@ -630,7 +630,7 @@ public class SalaryBillBO {
                    } else {
                        for (Object keyName : e.keySet()) {
                            if ((salaryItem.getId() + SalaryArchiveConstant.DYNAMIC_SUFFIX).equals(keyName.toString())) {
-                                String itemValue = e.getOrDefault(keyName.toString(), StringUtils.EMPTY).toString();
+                                String itemValue = Util.null2String(e.get(keyName.toString()));
                                boolean isHide = (isHideNull && StringUtils.isEmpty(itemValue))
                                        ||
                                        (isHideZero && NumberUtils.isCreatable(e.getOrDefault(keyName.toString(), "0").toString())
@ -711,7 +711,7 @@ public class SalaryBillBO {
                    SalaryTemplateSalaryItemListDTO salaryItem = itemPartition.get(i);
                    for (Object keyName : e.keySet()) {
                        if ((salaryItem.getId() + SalaryArchiveConstant.DYNAMIC_SUFFIX).equals(keyName.toString())) {
-                            String itemValue = e.getOrDefault(keyName.toString(), StringUtils.EMPTY).toString();
+                            String itemValue = Util.null2String(e.get(keyName.toString()));
                            boolean isHide = (isHideNull && StringUtils.isEmpty(itemValue))
                                    ||
                                    (isHideZero && NumberUtils.isCreatable(e.getOrDefault(keyName.toString(), "0").toString())
Author	SHA1	Message	Date
钱涛	61153309ca	Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01	2025-05-27 15:57:28 +08:00
钱涛	1026ff1aae	fix邮件中数据为null	2025-05-27 15:56:33 +08:00