From 7b70ab77f1197dc46a98b52007089965a720605f Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Mon, 22 Apr 2024 17:55:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=B5=B7=E9=A1=BA=E8=83=9C=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=9E=B6=E6=9E=84=E5=9B=BEv2=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E9=97=A8=E8=B4=9F=E8=B4=A3=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/organization/service/impl/ChartServiceImpl.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java
index 3f1a34af..34202cc7 100644
--- a/src/com/engine/organization/service/impl/ChartServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java
@@ -140,6 +140,7 @@ public class ChartServiceImpl extends Service implements ChartService {
             if (!isRealDimension && "2".equals(topChartPO.getFtype())){
                 ChartDepartmentModeVO departmentModeVO = selectModeInfo(rs.getString("id"));
                 topChartPO.setColorCheck(departmentModeVO.getColorCheck());
+                topChartPO.setFleader(departmentModeVO.getLeaderName());
             }
             filterAndAddData(dataList, topChartPO, hideDepartment);
             //dataList.add(topChartPO);
@@ -220,6 +221,7 @@ public class ChartServiceImpl extends Service implements ChartService {
                         if (!isRealDimension && "2".equals(chartPO.getFtype())){
                             ChartDepartmentModeVO departmentModeVO = selectModeInfo(rs.getString("id"));
                             chartPO.setColorCheck(departmentModeVO.getColorCheck());
+                            chartPO.setFleader(departmentModeVO.getLeaderName());
                         }
                     }
                 }
@@ -1551,6 +1553,7 @@ public class ChartServiceImpl extends Service implements ChartService {
                 if (!isRealDimension && "2".equals(chartPO.getFtype())){
                     ChartDepartmentModeVO departmentModeVO = selectModeInfo(recordSet.getString("id"));
                     chartPO.setColorCheck(departmentModeVO.getColorCheck());
+                    chartPO.setFleader(departmentModeVO.getLeaderName());
                 }
                 // 小于、等于所选层级元素展开
                 chartPO.setExpand(inDepth(selectDepth, chartPO.getDepartmentDepth()) ? "1" : "0");