From 6fa67839694ee80cd8b30630c6049dd380204ca9 Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 31 Jul 2025 15:50:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/impl/SelectServiceImpl.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java index 3f5c28a1..4fb1b256 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java @@ -93,22 +93,21 @@ public class SelectServiceImpl implements SelectService { stepTimes.put("数据过滤", System.currentTimeMillis() - filterStart); if (CollectionUtils.isNotEmpty(list)) { - // 步骤6: 获取班组数据（可选） + // 步骤6: 树形结构构建 + long buildStart = System.currentTimeMillis(); + groupList = buildTreeEfficiently(list); + // 步骤7: 获取班组数据（可选） if (bmUnit.getDeptId() == null) { long teamStart = System.currentTimeMillis(); List newList = mapper.getTeam(); stepTimes.put("获取班组数据", System.currentTimeMillis() - teamStart); - + if (CollectionUtils.isNotEmpty(newList)) { - list.addAll(newList); + groupList.addAll(newList); } } else { stepTimes.put("获取班组数据", 0L); // 跳过此步骤 } - - // 步骤7: 树形结构构建 - long buildStart = System.currentTimeMillis(); - groupList = buildTreeEfficiently(list); stepTimes.put("树形结构构建", System.currentTimeMillis() - buildStart); } } catch (Exception e) {