From 2118cbce866de9b549f8bf94c4b5d764ac4c7dc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 24 Feb 2025 18:33:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=8E=92=E9=99=A4=E8=B4=A6?=
 =?UTF-8?q?=E5=A5=97=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/WEB-INF/prop/hrmSalaryExcludeData.properties      | 1 +
 .../service/impl/SalaryStatisticsEmployeeServiceImpl.java  | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 resource/WEB-INF/prop/hrmSalaryExcludeData.properties

diff --git a/resource/WEB-INF/prop/hrmSalaryExcludeData.properties b/resource/WEB-INF/prop/hrmSalaryExcludeData.properties
new file mode 100644
index 000000000..a13a98e5c
--- /dev/null
+++ b/resource/WEB-INF/prop/hrmSalaryExcludeData.properties
@@ -0,0 +1 @@
+excludeSobIds=550
\ No newline at end of file
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
index 23eb83058..dcf3b1b95 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
@@ -1,6 +1,7 @@
 package com.engine.salary.report.service.impl;
 
 import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.StrUtil;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 import com.engine.salary.entity.datacollection.DataCollectionEmployee;
@@ -38,6 +39,7 @@ import com.wbi.util.Util;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import weaver.general.BaseBean;
 import weaver.hrm.User;
 
 import java.util.*;
@@ -336,6 +338,11 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
             List<Long> employeeIds = employeeList.stream().map(DataCollectionEmployee::getEmployeeId).collect(Collectors.toList());
             salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(acctEmp -> employeeIds.contains(acctEmp.getEmployeeId())).collect(Collectors.toList());
         }
+        String excludeSobIdsProp = new BaseBean().getPropValue("hrmSalaryExcludeData", "excludeSobIds");
+        if(StrUtil.isNotBlank(excludeSobIdsProp)){
+            List<Long> excludeSobIds = Arrays.stream(excludeSobIdsProp.split(",")).map(Long::valueOf).collect(Collectors.toList());
+            salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(emp -> !excludeSobIds.contains(emp.getSalarySobId())).collect(Collectors.toList());
+        }
         if (CollectionUtils.isEmpty(salaryAcctEmployeeList)) {
             return new PageInfo<>();
         }