From 47608b05226c84ece5f0f1d5312d154a1eca2a19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Sun, 18 Feb 2024 14:48:06 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.10.1.2401.01-=E7=A4=BE=E4=BF=9D?=
 =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=96=B9=E6=A1=88=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../welfarePlan/components/welfarePlanCustomDialog/index.js    | 2 +-
 .../welfarePlan/components/welfarePlanEditSlide/index.js       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanCustomDialog/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanCustomDialog/index.js
index bce632b6..d8f277d3 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanCustomDialog/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanCustomDialog/index.js
@@ -48,7 +48,7 @@ class Index extends Component {
           const { programmeStore: { planCustomForm } } = props;
           planCustomForm.initFormFields(this.state.conditions);
           _.forEach(getConditionDomkeys(this.state.conditions), k => {
-            if (k === "paymentScope" && props.customId) {
+            if (k === "paymentScope" && props.customId && form[k]) {
               planCustomForm.updateFields({ [k]: { value: form[k].join(",") } });
             } else {
               planCustomForm.updateFields({ [k]: { value: form[k] || "" } });
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js
index 0a1bf9c9..a70da52f 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js
@@ -82,7 +82,7 @@ class Index extends Component {
           const { planDatas } = this.state;
           const payload = {
             insuranceScheme: {
-              ...planForm.getFormParams(), welfareTypeEnum, id,
+              ...planForm.getFormParams(), welfareType: welfareTypeEnum, id,
               paymentArea: planForm.getFormParams().paymentType
             },
             insuranceSchemeDetailList: planDatas
@@ -174,6 +174,7 @@ class Index extends Component {
     //先统一上下限值
     let dataSource = _.reduce(planDatas, (pre, cur) => {
       const curData = _.find(datas, o => o.insuranceId === cur.insuranceId);
+      if (_.isEmpty(curData)) return [...pre, cur];
       return [...pre, { ...cur, lowerLimit: curData.lowerLimit, upperLimit: curData.upperLimit }];
     }, []);
     //再赋值修改值