From c212a2782f35f4ff413da57618249c8fddd01348 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Fri, 13 Sep 2024 14:54:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=BB=9F=E8=AE=A1=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=B2=97=E4=BD=8D=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SalaryAcctEmployeeServiceImpl.java   | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
index 621b2b068..7ca1a1f4d 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
@@ -712,19 +712,20 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
 //            }
 //            list = list.stream().filter(po -> employeeIdsByGradeFilter.contains(po.getEmployeeId())).collect(Collectors.toList());
 //        }
-//        // 岗位过滤
-//        if (CollectionUtils.isNotEmpty(param.getPosition())) {
-//            Set<Long> employeeIdsByPostionFilter = new HashSet<>();
-//            simpleEmployeeList.forEach(simpleEmployee -> {
-//                if (simpleEmployee.getPosition() != null && param.getPosition().contains(simpleEmployee.getPosition().getId())) {
-//                    employeeIdsByPostionFilter.add(simpleEmployee.getEmployeeId());
-//                }
-//            });
-//            if (CollectionUtils.isEmpty(employeeIdsByPostionFilter)) {
-//                return Lists.newArrayList();
-//            }
-//            list = list.stream().filter(po -> employeeIdsByPostionFilter.contains(po.getEmployeeId())).collect(Collectors.toList());
-//        }
+       // 岗位过滤
+        List<Long> position = param.getPosition();
+        if (CollectionUtils.isNotEmpty(position)) {
+           // Set<Long> employeeIdsByPostionFilter = new HashSet<>();
+           // simpleEmployeeList.forEach(simpleEmployee -> {
+           //     if (simpleEmployee.getPosition() != null && param.getPosition().contains(simpleEmployee.getPosition().getId())) {
+           //         employeeIdsByPostionFilter.add(simpleEmployee.getEmployeeId());
+           //     }
+           // });
+           // if (CollectionUtils.isEmpty(employeeIdsByPostionFilter)) {
+           //     return Lists.newArrayList();
+           // }
+            employeeList = employeeList.stream().filter(emp -> position.contains(emp.getJobtitleId())).collect(Collectors.toList());
+       }
         // 人事状态过滤
         if (CollectionUtils.isNotEmpty(param.getStatus())) {
             Set<Long> employeeIdsByStatus = new HashSet<>();