Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01

src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java

@@ -630,7 +630,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);
@@ -641,7 +642,7 @@ public class SalaryBillBO {
                                     emailContent.append("</th>");
 
                                     emailContent.append("<td style=\"padding: 16px 24px;display: table-cell;flex: 1;color: #000000d9;font-size: 12px;line-height: 1.5715;word-break: break-word;overflow-wrap: break-word;border-collapse: collapse;border: 1px solid rgba(0,0,0,.06);\">");
-                                    emailContent.append(e.getOrDefault(keyName.toString(), StringUtils.EMPTY));
+                                    emailContent.append(itemValue.replaceAll("null", ""));
                                     emailContent.append("</td>");
                                 }
                                 break;
@@ -710,7 +711,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);
@@ -721,7 +723,7 @@ public class SalaryBillBO {
                                 emailContent.append("</th>");
 
                                 emailContent.append("<td style=\"padding: 16px 24px;display: table-cell;flex: 1;color: #000000d9;font-size: 12px;line-height: 1.5715;word-break: break-word;overflow-wrap: break-word;border-collapse: collapse;border: 1px solid rgba(0,0,0,.06);\">");
-                                emailContent.append(e.getOrDefault(keyName.toString(), StringUtils.EMPTY));
+                                emailContent.append(itemValue.replaceAll("null", ""));
                                 emailContent.append("</td>");
                             }
                             break;