From 7dee340ab8d190c9aaae985470c44f7270d7b42c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 24 Apr 2024 15:20:13 +0800
Subject: [PATCH] hotfix/2.12.1.2404.02

---
 .../pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js      | 1 +
 pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js
index eb827a0a..e2b191ae 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js
@@ -55,6 +55,7 @@ class LedgerSalaryItemBaseInfo extends Component {
     const options = _.map(empFieldListOptions, o => ({
       ...o, disabled: _.map(dataSource, g => g.fieldId).includes(o.key)
     }));
+    if (_.isEmpty(dataSource) || _.isEmpty(options)) return null;
     return (
       <WeaSearchGroup needTigger={false} showGroup title={<TitleComp onPreview={onPreview}/>}>
         <div className="userInfoWrapper">
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
index ba853f81..e1f85aca 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
@@ -290,6 +290,7 @@ class SalaryItemSettings extends Component {
   render() {
     const { onChangeSalaryItem, salaryBillItemNameSet } = this.props;
     const { dataList, modalPayload, checkedValue } = this.state;
+    if (_.isEmpty(dataList)) return null;
     return (
       <div className="salaryItemSettingWrapper">
         <WeaSortable