修复导出非系统人员报表文件失败
This commit is contained in:
parent
cac3c11fa3
commit
d220833512
|
|
@ -439,7 +439,7 @@ public class SalaryStatisticsReportWrapper extends Service {
|
||||||
Map<String, Object> countResultMap = (Map<String, Object>) result.get("countResult");
|
Map<String, Object> countResultMap = (Map<String, Object>) result.get("countResult");
|
||||||
List<Map<String, Object>> list = page.getList();
|
List<Map<String, Object>> list = page.getList();
|
||||||
// 获取数据
|
// 获取数据
|
||||||
List<Map<String, Object>> records = list.stream().map(m -> m.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue()))).collect(Collectors.toList());
|
List<Map<String, Object>> records = list.stream().map(m -> m.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue() == null ? "" : e.getValue()))).collect(Collectors.toList());
|
||||||
records.add(countResultMap);
|
records.add(countResultMap);
|
||||||
|
|
||||||
List rows = new ArrayList<>();
|
List rows = new ArrayList<>();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue