From 00ecc61aa21c96be2669bec5281939d706da49c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 25 Mar 2026 17:01:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AC=A7=E5=A7=86=E9=BE=99=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E8=AF=B7=E5=81=87=E5=A4=9A=E5=B1=82=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RemoteAttend4SalaryServiceImpl.java  | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

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<Map> list = (List<Map>) column.get("children");
                 if (CollectionUtils.isNotEmpty(list)) {
-                    list.stream()
-                            .filter(leave -> leave.get("dataIndex") != null && StringUtils.isNotBlank(leave.get("dataIndex").toString()))
-                            .forEach(leave -> {
-                                Map<String, String> 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<String, String> 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<Map> children2 = (List<Map>) list2.get("children");
+                        children2.stream()
+                                .filter(leave -> leave.get("dataIndex") != null && StringUtils.isNotBlank(leave.get("dataIndex").toString()))
+                                .forEach(leave -> {
+                                    Map<String, String> 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);
+                                });
+                    }
+
                 }
             }
             //出勤班次