From 4a8c85cd41ebe7229e3ffea1dc3b932f4484ca01 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Thu, 12 Sep 2024 10:15:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E8=B4=9F=E8=B4=A3=E4=BA=BA?=
 =?UTF-8?q?=E5=A4=9A=E7=BA=A7=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/department/bo/DepartmentBO.java    | 24 +++++++++++--------
 .../service/impl/ExportCommonServiceImpl.java |  2 ++
 .../cronjob/StatisticsPersonCron.java         |  2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java
index 881632a5..2bc46841 100644
--- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java
+++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java
@@ -32,16 +32,20 @@ public class DepartmentBO {
      * @param list
      * @return
      */
-    public static List<DepartmentListDTO> buildDeptDTOShowNames(Collection<DepartmentListDTO> list) {
-        return list.stream().peek(e -> {
-                    List<DepartmentListDTO> children = e.getChildren();
-                    if (CollectionUtils.isNotEmpty(children)){
-                        List<DepartmentListDTO> collect = children.stream().peek(item -> item.setBmfzr(getEmployeeNameById(item.getId()))).collect(Collectors.toList());
-                        e.setChildren(collect);
-                    }
-                    e.setBmfzr(getEmployeeNameById(e.getId()));
-                }
-        ).collect(Collectors.toList());
+    public static List<DepartmentListDTO> buildDeptDTOShowNames(List<DepartmentListDTO> list) {
+        setDeptLeader(list);
+        return list;
+    }
+
+    public static void setDeptLeader(List<DepartmentListDTO> departments) {
+        for (DepartmentListDTO dept : departments) {
+            dept.setBmfzr(getEmployeeNameById(dept.getId()));
+            List<DepartmentListDTO> children = dept.getChildren();
+            if (CollectionUtils.isNotEmpty(children)){
+                setDeptLeader(children);
+            }
+        }
+
     }
 
     public static List<DepartmentListDTO> buildDeptDTOList(Collection<DepartmentPO> list, String orderType) {
diff --git a/src/com/engine/organization/service/impl/ExportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ExportCommonServiceImpl.java
index 97aec5a2..24298290 100644
--- a/src/com/engine/organization/service/impl/ExportCommonServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ExportCommonServiceImpl.java
@@ -206,6 +206,8 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ
 
         //todo 修复导出excel与列定制顺序
 
+
+
         // 增加id字段,跳转人员卡片
         WeaTableColumn weaTableColumn = new WeaTableColumn();
         weaTableColumn.setColumn("id");
diff --git a/src/weaver/interfaces/organization/cronjob/StatisticsPersonCron.java b/src/weaver/interfaces/organization/cronjob/StatisticsPersonCron.java
index 1f159df8..eec37e3a 100644
--- a/src/weaver/interfaces/organization/cronjob/StatisticsPersonCron.java
+++ b/src/weaver/interfaces/organization/cronjob/StatisticsPersonCron.java
@@ -34,7 +34,7 @@ public class StatisticsPersonCron extends BaseCronJob {
     @Override
     public void execute() {
         Integer value = StringUtils.isNotBlank(companyId) ? Integer.parseInt(companyId) : null;
-        StatisticsParam build = StatisticsParam.builder().companyId(value).build();
+        StatisticsParam build = StatisticsParam.builder().companyId(null).build();
         User user = new User();
         user.setUid(1);
         getChartService(user).recordStatistics(build);