From c8f281613bec34fc4489324fc20865d014ab5cba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 18 Mar 2025 17:45:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=98=8E=E7=BB=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=BA=E5=91=98=E6=B5=8F=E8=A7=88=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../param/SalaryStatisticsEmployeeSalaryQueryParam.java    | 3 +++
 .../service/impl/SalaryStatisticsEmployeeServiceImpl.java  | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeSalaryQueryParam.java b/src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeSalaryQueryParam.java
index a1dbab11b..a5d6b0253 100644
--- a/src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeSalaryQueryParam.java
+++ b/src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeSalaryQueryParam.java
@@ -25,6 +25,9 @@ public class SalaryStatisticsEmployeeSalaryQueryParam extends BaseQueryParam {
     // 关键字
     private String keyword;
 
+    //人员ids
+    private List<Long> employeeIds;
+
     // 起始年月
     private String startDateStr;
     private Date startDate;
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
index 2e49c8353..2267440fc 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
@@ -344,6 +344,13 @@ 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());
         }
+
+        //人员浏览按钮筛选
+        List<Long> employeeIds = queryParam.getEmployeeIds();
+        if(CollectionUtils.isNotEmpty(employeeIds)){
+            salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(acctEmp -> employeeIds.contains(acctEmp.getEmployeeId())).collect(Collectors.toList());
+        }
+
         if (CollectionUtils.isEmpty(salaryAcctEmployeeList)) {
             return new PageInfo<>();
         }