From 2261cf310408424329a426ca50a65cf3a9b74b89 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 19 Nov 2024 10:31:10 +0800
Subject: [PATCH] release/2.17.1.2411.01

---
 .../analysisOfSalaryStatistics/components/salaryDetails.js     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
index cbc72a7c..a45cee0f 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
@@ -177,8 +177,9 @@ class SalaryDetails extends Component {
     }
   });
   converCheckedCol = (data) => {
+    const { salaryDetailShowType } = this.props;
     return _.reduce(data.checked || [], (pre, cur) => {
-      const item = _.find(data.setting, k => (k.id === cur) || (k.column === cur.column));
+      const item = _.find(data.setting, k => (salaryDetailShowType !== "1" && k.id === cur) || (salaryDetailShowType === "1" && k.column === cur.column));
       if (!_.isEmpty(item)) return [...pre, { ...item, id: item.id || item.column, name: item.name || item.text }];
       return pre;
     }, []);