From 9a97151cc0a48de31970bd461d7bb297bb6137e9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 30 六月 2025 15:21:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
index 4014dd3..f05a930 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
@@ -75,7 +75,7 @@
TProjectDept parent = projectDeptService.getById(projectDept.getParentId());
List<TProjectDept> children = new ArrayList<>();
children.add(projectDept);
- parent.setChildren(children);
+// parent.setChildren(children);
projectDeptList.add(parent);
}else {
projectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
@@ -85,7 +85,7 @@
projectDeptList.forEach(projectDept -> {
List<TProjectDept> children = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
.eq(TProjectDept::getParentId, projectDept.getId()));
- projectDept.setChildren(children);
+// projectDept.setChildren(children);
});
}
return R.ok(projectDeptList);
--
Gitblit v1.7.1