From 6c3a4683faf0a46b54713c8b689369811032bc5e Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Tue, 2 Apr 2024 15:25:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=BA=E8=83=9C=E9=A1=B9=E7=9B=AE=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=9E=B6=E6=9E=84=E5=9B=BE=E4=BA=8C=E5=BC=80=201.?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E9=BB=98=E8=AE=A4=E5=B1=95?=
 =?UTF-8?q?=E5=BC=80=202.=E4=BA=BA=E5=91=98=E5=8D=A1=E7=89=87=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=B2=97=E4=BD=8D=203.=E4=BA=BA=E5=91=98=E5=8D=A1?=
 =?UTF-8?q?=E7=89=87=E7=82=B9=E5=87=BB=E5=B1=95=E7=A4=BA=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E8=81=8C=E8=B4=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/organization/entity/chart/ChartPO.java  |  4 ++++
 .../service/impl/ChartServiceImpl.java             | 14 ++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/com/engine/organization/entity/chart/ChartPO.java b/src/com/engine/organization/entity/chart/ChartPO.java
index da8b4d17..7d385060 100644
--- a/src/com/engine/organization/entity/chart/ChartPO.java
+++ b/src/com/engine/organization/entity/chart/ChartPO.java
@@ -41,6 +41,10 @@ public class ChartPO {
     // 人员头像
     private String fleaderimg;
 
+    private String jobTitle;
+
+    private String jobResponsibility;
+
     private String id;
     private String key;
 
diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java
index bb9755b2..33387242 100644
--- a/src/com/engine/organization/service/impl/ChartServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java
@@ -26,6 +26,7 @@ import weaver.general.Util;
 import weaver.hrm.User;
 import weaver.hrm.company.DepartmentComInfo;
 import weaver.hrm.company.SubCompanyComInfo;
+import weaver.hrm.job.JobTitlesComInfo;
 import weaver.hrm.resource.ResourceComInfo;
 
 import java.time.LocalDate;
@@ -311,7 +312,7 @@ public class ChartServiceImpl extends Service implements ChartService {
                 rs.executeQuery(sql, departmentId, jobTitlePO.getFobjid());
                 String parentId = departmentId + "_" + jobTitlePO.getFobjid();
                 while (rs.next()) {
-                    ChartPO chartPO = getResourceChartPO(rs.getString("id"), rs.getString("name"), parentId, rs.getString("belongto"), rs.getString("companyworkyear"));
+                    ChartPO chartPO = getResourceChartPO(rs.getString("id"), rs.getString("name"), parentId, rs.getString("belongto"), rs.getString("companyworkyear"),isRealDimension);
                     resourceNum++;
                     dataList.add(chartPO);
                 }
@@ -333,7 +334,7 @@ public class ChartServiceImpl extends Service implements ChartService {
             }
             rs.executeQuery(sql, departmentId);
             while (rs.next()) {
-                ChartPO chartPO = getResourceChartPO(rs.getString("id"), rs.getString("name"), rootId, rs.getString("belongto"), rs.getString("companyworkyear"));
+                ChartPO chartPO = getResourceChartPO(rs.getString("id"), rs.getString("name"), rootId, rs.getString("belongto"), rs.getString("companyworkyear"),isRealDimension);
                 dataList.add(chartPO);
                 departmentOnJob++;
             }
@@ -365,18 +366,23 @@ public class ChartServiceImpl extends Service implements ChartService {
      * @param companyWorkYear 司龄
      * @return
      */
-    private ChartPO getResourceChartPO(String id, String name, String parentId, String belongTo, String companyWorkYear) {
+    @SneakyThrows
+    private ChartPO getResourceChartPO(String id, String name, String parentId, String belongTo, String companyWorkYear, boolean isRealDimension) {
         ChartPO chartPO = new ChartPO();
+        ResourceComInfo comInfo = new ResourceComInfo();
+        JobTitlesComInfo jobInfo = new JobTitlesComInfo();
         chartPO.setFtype("4");
         chartPO.setFobjid(id);
         chartPO.setId(chartPO.getFobjid());
         chartPO.setFname(name);
         // 岗位处理后的ID
         chartPO.setParentId(parentId);
-        chartPO.setExpand("0");
+        chartPO.setExpand(isRealDimension ? "0" : "1");
         chartPO.setHasChildren("0");
         chartPO.setBelongto(Util.null2String(belongTo));
         chartPO.setCompanyWorkYear(companyWorkYear);
+        chartPO.setJobTitle(jobInfo.getJobTitlesname(comInfo.getJobTitle(id)));
+        chartPO.setJobResponsibility(jobInfo.getJobresponsibility(comInfo.getJobTitle(id)));
         try {
             chartPO.setFleaderimg(new ResourceComInfo().getMessagerUrls(chartPO.getId()));
         } catch (Exception e) {