From ba49afb85dea512bdd8a889e6cb892b37a0c3e9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 30 Jan 2024 15:46:37 +0800
Subject: [PATCH] =?UTF-8?q?release/2.10.1.2401.01=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/ledgerPage/components/ledgerSalaryItemTable.js       | 3 ++-
 .../welfareArchive/components/welfareEditArchiveSlide/index.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
index 9366f360..ca9d9218 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
@@ -250,7 +250,8 @@ class LedgerSalaryItemTable extends Component {
         render: (text, record) => {
           const { salarySobId, salaryItemId } = record;
           return <a
-            href={`/spa/hrmSalary/static/index.html#/main/hrmSalary/topologyView/${salarySobId}/${salaryItemId}`}
+            // href={`/spa/hrmSalary/static/index.html#/main/hrmSalary/topologyView/${salarySobId}/${salaryItemId}`}
+            href="javascript:void(0);"
             target="_blank">{text}</a>;
         }
       },
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
index 2a9eed2d..03a89212 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
@@ -161,7 +161,7 @@ class Index extends Component {
     return {
       baseForm: JSON.stringify({
         ...formData[welfareType], ..._.reduce(_.keys(formData[welfareType]), (pre, cur) => {
-          if (welfareData[cur]) return { ...pre, [cur]: welfareData[cur] };
+          if (welfareData[cur] || !_.isNil(welfareData[cur])) return { ...pre, [cur]: welfareData[cur] };
           return { ...pre };
         }, {}),
         underTake: welfareData[`${underTakeType}UnderTake`]