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 {text}; } }, 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`]