diff --git a/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java b/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java index eeddfd41d..115e28395 100644 --- a/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java +++ b/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java @@ -60,14 +60,26 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt if (dataIndex.equals("leave") && column.get("children") != null) { List list = (List) column.get("children"); if (CollectionUtils.isNotEmpty(list)) { - list.stream() - .filter(leave -> leave.get("dataIndex") != null && StringUtils.isNotBlank(leave.get("dataIndex").toString())) - .forEach(leave -> { - Map map = Maps.newHashMapWithExpectedSize(2); - map.put("code", leave.get("dataIndex").toString()); - map.put("name", Util.null2String(column.get("title")) + "-" + leave.get("title") + "(" + leave.get("unit").toString() + ")"); - columns.add(map); - }); +// list.stream() +// .filter(leave -> leave.get("dataIndex") != null && StringUtils.isNotBlank(leave.get("dataIndex").toString())) +// .forEach(leave -> { +// Map map = Maps.newHashMapWithExpectedSize(2); +// map.put("code", leave.get("dataIndex").toString()); +// map.put("name", Util.null2String(column.get("title")) + "-" + leave.get("title") + "(" + leave.get("unit").toString() + ")"); +// columns.add(map); +// }); + for (Map list2:list) { + List children2 = (List) list2.get("children"); + children2.stream() + .filter(leave -> leave.get("dataIndex") != null && StringUtils.isNotBlank(leave.get("dataIndex").toString())) + .forEach(leave -> { + Map map = Maps.newHashMapWithExpectedSize(2); + map.put("code", leave.get("dataIndex").toString()); + map.put("name", Util.null2String(column.get("title")) + "-" + leave.get("title") + "(" + leave.get("unit").toString() + ")"); + columns.add(map); + }); + } + } } //出勤班次