diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index dad8420be..a080c37ab 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -590,11 +590,11 @@ public class SIArchivesBiz { } if(StringUtils.isNotBlank(param.getDepartmentIdsStr())) { - request.setDepartmentIds(Arrays.stream(param.getDepartmentIdsStr().split(",")).map(BigDecimal::new).collect(Collectors.toList())); + param.setDepartmentIds(Arrays.stream(param.getDepartmentIdsStr().split(",")).map(BigDecimal::new).collect(Collectors.toList())); } if(StringUtils.isNotBlank(param.getPositionsStr())) { - request.setDepartmentIds(Arrays.stream(param.getPositionsStr().split(",")).map(BigDecimal::new).collect(Collectors.toList())); + param.setDepartmentIds(Arrays.stream(param.getPositionsStr().split(",")).map(BigDecimal::new).collect(Collectors.toList())); } Integer current = param.getCurrent() == null ? 1 : param.getCurrent(); diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml index 0be69bf8f..584837e18 100644 --- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml @@ -323,6 +323,7 @@ FROM hrmresource e LEFT JOIN hrmdepartment d ON e.departmentid = d.ID + where e.accounttype is null )a LEFT JOIN( SELECT