From 709ec6abd72ca5b73f6b061b120af51413c01144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 15 Apr 2024 16:07:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?hotfix/2.12.1.2403.02=20=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE-=E5=8A=A0=E5=AF=86=E8=A7=A3=E5=AF=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js b/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
index 3e50d8ad..efda13dd 100644
--- a/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
+++ b/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
@@ -38,7 +38,8 @@ class RuleConfig extends Component {
     const optionsList = { matchRule, orderRule, ascOrDesc, rule };
     this.setState({
       sysinfo, conditions: _.map(conditions, item => ({
-        ...item, items: _.map(item.items, o => {
+        ...item,
+        items: _.map(item.items, o => {
           if (getKey(o) === "matchRule" || getKey(o) === "orderRule" || getKey(o) === "ascOrDesc" || getKey(o) === "rule") {
             return { ...o, options: _.map(optionsList[getKey(o)], g => ({ key: g.value, showname: g.defaultLabel })) };
           } else if (getKey(o) === "OPEN_APPLICATION_ENCRYPT") {
@@ -70,6 +71,8 @@ class RuleConfig extends Component {
         form.updateFields({ [item]: { value: sysinfo["taxDeclarationFunction"] === "0" ? "0" : "1" } });
       } else if (item === "taxAgentShowStatus" || item === "salaryShowStatus" || item === "adjustShowStatus") {
         form.updateFields({ [item]: { value: sysinfo[item] || "1" } });
+      } else if (item === "OPEN_APPLICATION_ENCRYPT") {
+        form.updateFields({ [item]: { value: _.isNil(sysinfo[item]) ? "1" : (sysinfo[item] || "") } });
       } else {
         form.updateFields({ [item]: { value: sysinfo[item] || "" } });
       }
@@ -297,13 +300,15 @@ class RuleConfig extends Component {
 
   render() {
     const { baseFormStore: { form } } = this.props;
-    const { conditions, progressVisible, progress } = this.state;
+    const { conditions, progressVisible, progress, sysinfo } = this.state;
+    const ruleConditions = sysinfo.showEncryptOperationButton === "true" ? conditions :
+      _.filter(conditions, o => o.title !== getLabel(543358, "加密规则"));
     return (
       <WeaTop
         title={<span>{getLabel(543355, "规则配置")}</span>} icon={<i className="icon-coms-Flow-setting"/>}
         iconBgcolor="#F14A2D" buttons={[]} className="ruleWrapper-layout"
       >
-        <div className="ruleWrapper">{renderRuleForm(form, conditions, this.handleChange)}</div>
+        <div className="ruleWrapper">{renderRuleForm(form, ruleConditions, this.handleChange)}</div>
         {/*加解密进度条*/}
         {
           progressVisible &&

From 6d56f162b1c0e23496b7623bca86c916aa0c900d 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, 16 Apr 2024 17:10:31 +0800
Subject: [PATCH 2/2] hotfix/2.12.1.2403.02

---
 pc4mobx/hrmSalary/pages/calculate/index.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/index.less b/pc4mobx/hrmSalary/pages/calculate/index.less
index 98cfc21f..699c416f 100644
--- a/pc4mobx/hrmSalary/pages/calculate/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/index.less
@@ -86,7 +86,7 @@
         display: none;
       }
 
-      td {
+      td:not(.ant-table-selection-column) {
         span {
           width: 100%;
           overflow: hidden;