diff --git a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
index 5319fec42..98949cee3 100644
--- a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
+++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
@@ -649,7 +649,8 @@ public class SalaryBillBO {
} else {
for (Object keyName : e.keySet()) {
if ((salaryItem.getId() + SalaryArchiveConstant.DYNAMIC_SUFFIX).equals(keyName.toString())) {
- boolean isHide = (isHideNull && StringUtils.isEmpty(e.getOrDefault(keyName.toString(), StringUtils.EMPTY).toString()))
+ String itemValue = e.getOrDefault(keyName.toString(), StringUtils.EMPTY).toString();
+ boolean isHide = (isHideNull && StringUtils.isEmpty(itemValue))
||
(isHideZero && NumberUtils.isCreatable(e.getOrDefault(keyName.toString(), "0").toString())
&& BigDecimal.ZERO.compareTo(new BigDecimal(e.getOrDefault(keyName.toString(), "0").toString())) == 0);
@@ -660,7 +661,7 @@ public class SalaryBillBO {
emailContent.append("");
emailContent.append("
");
- emailContent.append(e.getOrDefault(keyName.toString(), StringUtils.EMPTY));
+ emailContent.append(itemValue.replaceAll("null", ""));
emailContent.append(" | ");
}
break;
@@ -729,7 +730,8 @@ public class SalaryBillBO {
SalaryTemplateSalaryItemListDTO salaryItem = itemPartition.get(i);
for (Object keyName : e.keySet()) {
if ((salaryItem.getId() + SalaryArchiveConstant.DYNAMIC_SUFFIX).equals(keyName.toString())) {
- boolean isHide = (isHideNull && StringUtils.isEmpty(e.getOrDefault(keyName.toString(), StringUtils.EMPTY).toString()))
+ String itemValue = e.getOrDefault(keyName.toString(), StringUtils.EMPTY).toString();
+ boolean isHide = (isHideNull && StringUtils.isEmpty(itemValue))
||
(isHideZero && NumberUtils.isCreatable(e.getOrDefault(keyName.toString(), "0").toString())
&& BigDecimal.ZERO.compareTo(new BigDecimal(e.getOrDefault(keyName.toString(), "0").toString())) == 0);
@@ -740,7 +742,7 @@ public class SalaryBillBO {
emailContent.append("");
emailContent.append("");
- emailContent.append(e.getOrDefault(keyName.toString(), StringUtils.EMPTY));
+ emailContent.append(itemValue.replaceAll("null", ""));
emailContent.append(" | ");
}
break;