From 5b43e43f4a1ad12d8f6725d35a6bc77a385ac289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 21 Sep 2023 15:20:59 +0800
Subject: [PATCH 1/2] hotfix/2.9.42309.01

---
 .../standingBookDetail/components/adjustTable.js          | 8 +++++++-
 .../components/adjustmentDefaultSlide.js                  | 2 +-
 .../standingBookDetail/components/adjustmentSlide.js      | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js
index 2a1b9c6d..4d7a3bf8 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js
@@ -410,7 +410,13 @@ class AdjustTable extends Component {
                 this.setState({
                   dataSource: _.map(this.state.dataSource, it => {
                     if (record.target === it.target && record.uuid === it.uuid) {
-                      return { ...it, status: true, id: successIds[0] };
+                      return {
+                        ...it, status: true, id: successIds[0],
+                        targetOptions: _.map([_.find(targetOptions, o => o.employeeId == target)], v => ({
+                          key: v.target.toString(),
+                          showname: v.username
+                        }))
+                      };
                     }
                     return { ...it };
                   })
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js
index 5651926e..47542d39 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js
@@ -69,7 +69,7 @@ class AdjustmentDefaultSlide extends Component {
         dataIndex: "categoryType", title: "统计调差福利类型（单位）",
         render: (text, record) => {
           return (
-            <span>{_.map(record.categoryTypeOptions, it => it.showname).join(",")}</span>
+            <span>{_.map(_.filter(record.categoryTypeOptions, o => (record.categoryType.split(",").includes(o.key))), it => it.showname).join(",")}</span>
           );
         }
       },
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
index 2fb3f37c..94c8d72d 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
@@ -83,6 +83,7 @@ class AdjustmentSlide extends Component {
   };
   handleSetasDefault = () => {
     const { adjustDefSlide } = this.state;
+    console.log(this.adjustTableRef.state.dataSource);
     this.setState({
       adjustDefSlide: {
         ...adjustDefSlide,

From e4d9a2c545b7703d3afc91c795f0868957700d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 21 Sep 2023 15:45:58 +0800
Subject: [PATCH 2/2] hotfix/2.9.42309.01

---
 .../components/salaryStatisticsDetailShareLogDialog.js      | 6 +++---
 pc4mobx/hrmSalary/pages/salaryItem/index.js                 | 2 +-
 .../standingBookDetail/components/adjustTable.js            | 2 +-
 .../standingBookDetail/components/adjustmentSlide.js        | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareLogDialog.js b/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareLogDialog.js
index 1632940f..51fdc5d0 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareLogDialog.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareLogDialog.js
@@ -158,9 +158,9 @@ class SalaryStatisticsDetailShareLogDialog extends Component {
                                    title={
                                      <div>
                                        <p>{getLabel(111, "1、分享状态为成功且撤回状态为空时，可操作撤回；")}</p>
-                                       <p>{getLabel(111, "2、撤回后不可重新分享；")}</p>
-                                       <p>{getLabel(111, "3、分享状态为失败，可操作重新分享；")}</p>
-                                       <p>{getLabel(111, "4、重新分享：以当前分享记录的分享报表、有效时间、渠道和说明重新分享，分享后自动刷新分享时间和分享状态")}</p>
+                                       {/*<p>{getLabel(111, "2、撤回后不可重新分享；")}</p>*/}
+                                       {/*<p>{getLabel(111, "3、分享状态为失败，可操作重新分享；")}</p>*/}
+                                       {/*<p>{getLabel(111, "4、重新分享：以当前分享记录的分享报表、有效时间、渠道和说明重新分享，分享后自动刷新分享时间和分享状态")}</p>*/}
                                      </div>
                                    }
                     />
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js
index c2c63718..a4ffcd0a 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js
@@ -384,7 +384,7 @@ export default class SalaryItem extends React.Component {
           onCancel={() => this.setState({
             syncSalarySetDialog: {
               ...this.state.syncSalarySetDialog,
-              visible: false, id: "", title: ""
+              visible: false, title: ""
             }
           })}
         />
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js
index 4d7a3bf8..45023dba 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js
@@ -409,7 +409,7 @@ class AdjustTable extends Component {
               if (_.isEmpty(errorMessage)) {
                 this.setState({
                   dataSource: _.map(this.state.dataSource, it => {
-                    if (record.target === it.target && record.uuid === it.uuid) {
+                    if (record.id === it.id || (!it.id && record.uuid === it.uuid)) {
                       return {
                         ...it, status: true, id: successIds[0],
                         targetOptions: _.map([_.find(targetOptions, o => o.employeeId == target)], v => ({
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
index 94c8d72d..2fb3f37c 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
@@ -83,7 +83,6 @@ class AdjustmentSlide extends Component {
   };
   handleSetasDefault = () => {
     const { adjustDefSlide } = this.state;
-    console.log(this.adjustTableRef.state.dataSource);
     this.setState({
       adjustDefSlide: {
         ...adjustDefSlide,