qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

档案高级搜索

This commit is contained in:
MustangDeng 2022-06-06 11:24:16 +08:00
parent a24cb2e6d6
commit 24187b95bf
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/salary/biz/SIArchivesBiz.java
View File

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

1
src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
View File

@ -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