From 5a3ea0c868c7571ad64dc0e8fb5893bb52f2ce91 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Tue, 8 Oct 2024 16:34:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E5=9B=BE?=
 =?UTF-8?q?=E4=B8=AA=E6=80=A7=E5=8C=96=E9=9C=80=E6=B1=82=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/service/impl/ChartServiceImpl.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java
index 957a0852..e427604f 100644
--- a/src/com/engine/organization/service/impl/ChartServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java
@@ -135,6 +135,18 @@ public class ChartServiceImpl extends Service implements ChartService {
             topChartPO.setExpand("1");
             topChartPO.setFisvitual(rs.getString("isvitual"));
             topChartPO.setHasChildren(getHasChildren(topChartPO.getFtype(), topChartPO.getFobjid()).toString());
+
+            //二开顶部节点为集团时单独统计在职数和编制数
+            if ("0".equals(root)) {
+                rs.executeQuery("select count(1) as sum from hrmresource where status < 4");
+                rs.next();
+                topChartPO.setOnJobNum(Util.getIntValue(rs.getString("sum"),0));
+
+                rs.executeQuery("select sum(staff_num) as staff_sum from jcl_org_onjob where type = 2");
+                rs.next();
+                topChartPO.setStaffNum(Util.getIntValue(rs.getString("staff_sum"),0));
+            }
+
             filterAndAddData(dataList, topChartPO, hideDepartment);
             //dataList.add(topChartPO);
         }
@@ -154,6 +166,7 @@ public class ChartServiceImpl extends Service implements ChartService {
     }
 
 
+
     @Override
     public Map<String, Object> asyncCompanyData(Map<String, Object> params) {