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()); }