From 2fa5dcc3849f9614a4eeab991e03c49378828572 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 28 Aug 2025 10:32:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=94=AF=E6=8C=81=E4=BC=A0?= =?UTF-8?q?=E8=B4=A6=E5=A5=97id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/salaryacct/param/FsdReportRuleJSONParam.java | 1 + .../salary/service/impl/SalaryAcctResultServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/com/engine/salary/entity/salaryacct/param/FsdReportRuleJSONParam.java b/src/com/engine/salary/entity/salaryacct/param/FsdReportRuleJSONParam.java index 43b9804c0..de4e22f68 100644 --- a/src/com/engine/salary/entity/salaryacct/param/FsdReportRuleJSONParam.java +++ b/src/com/engine/salary/entity/salaryacct/param/FsdReportRuleJSONParam.java @@ -25,6 +25,7 @@ public class FsdReportRuleJSONParam { private List deptids; private List jobtitleids; private List subcomids; + private List salarysobids; } diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index e3dc1e40b..112a8145f 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -1609,6 +1609,9 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe resultMap.put("value", lsValSum.toString()); return resultMap; } + if (CollectionUtils.isNotEmpty(rule.getSalarysobids())) { + salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(salaryAcctEmployee -> rule.getSalarysobids().contains(salaryAcctEmployee.getSalarySobId())).collect(Collectors.toList()); + } if (CollectionUtils.isNotEmpty(rule.getSubcomids())) { salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(salaryAcctEmployee -> rule.getSubcomids().contains(salaryAcctEmployee.getSubcompanyId())).collect(Collectors.toList()); }