部门负责人多级显示问题处理

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) {
+    public static List<DepartmentListDTO> buildDeptDTOShowNames(List<DepartmentListDTO> list) {
-        return list.stream().peek(e -> {
+        setDeptLeader(list);
-                    List<DepartmentListDTO> children = e.getChildren();
+        return list;
-                    if (CollectionUtils.isNotEmpty(children)){
+    }
-                        List<DepartmentListDTO> collect = children.stream().peek(item -> item.setBmfzr(getEmployeeNameById(item.getId()))).collect(Collectors.toList());
+
-                        e.setChildren(collect);
+    public static void setDeptLeader(List<DepartmentListDTO> departments) {
-                    }
+        for (DepartmentListDTO dept : departments) {
-                    e.setBmfzr(getEmployeeNameById(e.getId()));
+            dept.setBmfzr(getEmployeeNameById(dept.getId()));
-                }
+            List<DepartmentListDTO> children = dept.getChildren();
-        ).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(children)){
+                setDeptLeader(children);
+            }
+        }
+
     }
 
     public static List<DepartmentListDTO> buildDeptDTOList(Collection<DepartmentPO> list, String orderType) {

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");

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);