From 02a367befb1c9c004b7b4b0c2e555c4abde4aa14 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 10 Dec 2024 09:11:12 +0800
Subject: [PATCH] =?UTF-8?q?release/2.18.1.2412.01=20=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E6=A0=B8=E7=AE=97=E8=BF=9B=E5=BA=A6=E6=9D=A1=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/calculate/doCalc/index.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
index 602e48b5..4f4944c7 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
@@ -77,7 +77,8 @@ class Index extends Component {
           if (this.timer) clearInterval(this.timer);
           this.timer = setInterval(() => {
             getCalculateProgress(salaryAcctRecordId).then(({ data }) => {
-              if ((_.isNil(data) || data.progress === 1) && this.timer) {
+              let progress = data.progress;
+              if (progress === 1 && this.timer) {
                 clearInterval(this.timer);
                 this.timer = null;
                 this.setState({
@@ -95,7 +96,7 @@ class Index extends Component {
                 });
                 message.error(data.message);
               }
-              this.setState({ progress: Number(data.progress) * 100 });
+              this.setState({ progress: Number(progress) * 100 });
             });
           }, 1000);
         });