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

Merge branch 'fix/240702-社保福利档案导入下载模板bug' into release/2.15.1.2407.01

This commit is contained in:
Harryxzy 2024-07-30 18:17:49 +08:00
parent 9819bb25e0 0c3610961f
commit bcf5fbdce7
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/engine/salary/service/impl/SIImportServiceImpl.java
View File

@ -142,6 +142,18 @@ public class SIImportServiceImpl extends Service implements SIImportService {
int total = (int)pageInfo.getTotal();
param.setPageSize(total);
param.setCurrent(1);
if (CollectionUtils.isNotEmpty(param.getDepartmentIds())) {
param.setDepartmentIdsStr(StringUtils.join(param.getDepartmentIds(), ","));
}
if (CollectionUtils.isNotEmpty(param.getSubcompanyIds())) {
param.setSubcompanyIdsStr(StringUtils.join(param.getSubcompanyIds(), ","));
}
if (CollectionUtils.isNotEmpty(param.getPositions())) {
param.setPositionsStr(StringUtils.join(param.getPositions(), ","));
}
if (CollectionUtils.isNotEmpty(param.getStatuses())) {
param.setStatusesStr(StringUtils.join(param.getStatuses(), ","));
}
Map<String, Object> dataMap = getSIArchivesService(user).listPage(param);
List<Map<String, Object>> records = (List<Map<String, Object>>)dataMap.get("datas");