diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml index f141c8728..f414ff60f 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml @@ -579,6 +579,7 @@ @@ -592,6 +593,12 @@ AND em.workcode like '%'||#{param.workcode}||'%' + + AND em.subcompanyid1 IN + + #{subcompanyId} + + AND em.departmentid IN @@ -655,6 +662,7 @@ @@ -668,6 +676,12 @@ AND em.workcode like '%'+#{param.workcode}+'%' + + AND em.subcompanyid1 IN + + #{subcompanyId} + + AND em.departmentid IN diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java index 8df680db0..6f06d003b 100644 --- a/src/com/engine/salary/web/SalaryAcctController.java +++ b/src/com/engine/salary/web/SalaryAcctController.java @@ -719,6 +719,14 @@ public class SalaryAcctController { if (StringUtils.isNotBlank(ids)) { param.setIds(Arrays.stream(ids.split(",")).map(Long::valueOf).collect(Collectors.toList())); } + String workcode = request.getParameter("workcode"); + if (StringUtils.isNotBlank(workcode)) { + param.setWorkcode(workcode); + } + String subcompanyIds = request.getParameter("subcompanyIds"); + if (StringUtils.isNotBlank(subcompanyIds)) { + param.setSubcompanyIds(Arrays.stream(subcompanyIds.split(",")).map(Long::valueOf).collect(Collectors.toList())); + } }