From 3d7b5927b381dd07520c62ccd7e1229788fe92c5 Mon Sep 17 00:00:00 2001
From: Mlin <ml123456>
Date: Thu, 13 Jul 2023 17:51:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=AE=B0=E5=BD=95=EF=BC=8C?=
 =?UTF-8?q?=E8=99=9A=E6=8B=9F=E4=BA=BA=E5=91=98bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java
index cc8f452f..85842c99 100644
--- a/src/com/engine/organization/service/impl/ChartServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java
@@ -745,15 +745,15 @@ public class ChartServiceImpl extends Service implements ChartService {
         //虚拟人员版本存储
         rs.executeQuery("select resourceid,workyear,usekind,a.managerstr,status,sex,accounttype,belongto,loginid," +
                 "maritalstatus,b.telephone,mobile,mobilecall,email,c.locationname,resourcetype,startdate,enddate," +
-                "d.id as jobtitleid,d.JOBTITLENAME as jobtitle,joblevel,seclevel,b.departmentid,e.departmentname as department," +
-                "b.subcompanyid1 as subcompanyid,f.subcompanyname as subcompany,b.costcenterid as costcenter," +
+                "d.id as jobtitleid,d.JOBTITLENAME as jobtitle,joblevel,seclevel,e.id as departmentid,e.departmentname as department," +
+                "f.id as subcompanyid,f.subcompanyname as subcompany,b.costcenterid as costcenter," +
                 "b.managerid as manager,b.assistantid as assistant,workcode,classification,policy," +
                 "a.virtualtype from hrmresourcevirtual a \n" +
                 "left join hrmresource b on a.RESOURCEID=b.ID\n" +
                 "left join  hrmlocations c on b.locationid=c.id\n" +
                 "left join hrmjobtitles d on b.jobtitle=d.id\n" +
-                "left join hrmdepartmentvirtual e on b.DEPARTMENTID=e.id\n" +
-                "left join hrmsubcompanyvirtual f on b.SUBCOMPANYID1=f.id where a.virtualtype=?",fclass);
+                "left join hrmdepartmentvirtual e on a.DEPARTMENTID=e.id\n" +
+                "left join hrmsubcompanyvirtual f on a.SUBCOMPANYID=f.id where a.virtualtype=?",fclass);
         insertParamList = new ArrayList<>();
         while (rs.next()) {
             insertList = new ArrayList<>();