From a3f40f506dd37e710b146a5df9c88a68bd520888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 19 Aug 2024 16:28:53 +0800
Subject: [PATCH] hotfix/2.15.1.2407.01

---
 .../doCalc/components/salaryEditCalc/editSalaryCalcSlide.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
index 0943bd38..235bac13 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
@@ -104,14 +104,14 @@ class EditSalaryCalcSlide extends Component {
             ..._.map(cur.salaryItems, it => {
               return {
                 salaryItemId: it.salaryItemId,
-                resultValue: (it.dataType === "number" && !!it.resultValue) ? toDecimal_n(it.resultValue, it.pattern || 2) : it.resultValue
+                resultValue: (it.dataType === "number" && !!it.resultValue) ? toDecimal_n(it.resultValue, !_.isNil(it.pattern) ? it.pattern : 2) : it.resultValue
               };
             })
           ];
         }, []),
         ...issuedAndReissueItems.map(item => ({
           salaryItemId: item.salaryItemId,
-          resultValue: (item.dataType === "number" && !!item.resultValue) ? toDecimal_n(item.resultValue, item.pattern || 2) : item.resultValue
+          resultValue: (item.dataType === "number" && !!item.resultValue) ? toDecimal_n(item.resultValue, !_.isNil(item.pattern) ? item.pattern : 2) : item.resultValue
         }))
       ]
     };