From d67b8bc6ab5e176346da338737383cb7405d5d29 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, 11 Oct 2023 18:23:19 +0800
Subject: [PATCH] hotfix/2.9.42310.01

---
 pc4mobx/hrmSalary/pages/mobilePayroll/index.js        | 3 ++-
 pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
index 9cfc0a52..bd152a29 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
@@ -143,7 +143,8 @@ export default class MobilePayroll extends React.Component {
               const { salaryTemplate } = mySalaryBillData;
               const { feedbackUrl } = salaryTemplate;
               this.getMySalaryBill(getQueryString("id"));
-              window.open(`${window.ecologyContentPath || ""}${feedbackUrl}`);
+              window.location.href=`${window.ecologyContentPath || ""}${feedbackUrl}`
+              // window.open(`${window.ecologyContentPath || ""}${feedbackUrl}`);
             } else {
               message.error(errorMsg);
             }
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
index 98c706fc..fcfbf8a7 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
@@ -312,7 +312,7 @@ export default class FormalFormModal extends React.Component {
       // validateType: this.props.dataType || this.state.returnType,
       // extendParam: JSON.stringify(this.state.extendParam),
       // formula: this.state.value,
-      parameters: this.parameters,
+      parameters: _.map(this.parameters, o => ({ ...o, content: o.content || "" })),
       id: this.props.formulaId
       // referenceType: this.referenceType == "" ? this.props.valueType == "2" ? "formula" : this.props.valueType == "3" ? "sql" : "" : this.referenceType
     };