From 76d91381913d284453314a05e0405ea8bf7a7def Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Thu, 21 Nov 2024 17:52:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E5=9B=BE?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E9=83=A8=E9=97=A8=E8=B4=9F=E8=B4=A3=E4=BA=BA?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E9=97=AE=E9=A2=98=E5=92=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/service/impl/ChartServiceImpl.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java index 957a0852..4bc2e1d4 100644 --- a/src/com/engine/organization/service/impl/ChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java @@ -1007,7 +1007,7 @@ public class ChartServiceImpl extends Service implements ChartService { " left join JCL_ORG_ONJOB d on a.id=d.data_id and d.type=1 "; deptQuerySql = "select a.id as departmentid, a.departmentmark, a.departmentname, a.subcompanyid1 as subcompanyid, " + "b.SUBCOMPANYNAME as subcompany,a.supdepid as supdepartmentid,c.departmentname as supdepartment," + - "a.canceled,a.departmentcode,a.coadjutant,a.tlevel,d.bmlx as isvirtual,a.bmfzr as fleader,e.on_job_num,e.staff_num " + + "a.canceled,a.departmentcode,a.coadjutant,a.tlevel,d.bmlx as isvirtual,d.bmfzr as fleader,e.on_job_num,e.staff_num " + "from hrmdepartment a left join hrmsubcompany b on a.subcompanyid1 = b.id " + "left join hrmdepartment c on a.supdepid = c.id " + "left join hrmdepartmentdefined d on a.id=d.deptid " + @@ -1040,7 +1040,7 @@ public class ChartServiceImpl extends Service implements ChartService { " a.departmentcode,\n" + " a.coadjutant,\n" + " a.tlevel,\n" + - " a.bmfzr as fleader,\n" + + " d.bmfzr as fleader,\n" + " d.on_job_num,\n" + " d.staff_num" + " from hrmdepartment a\n" + @@ -1671,9 +1671,6 @@ public class ChartServiceImpl extends Service implements ChartService { * @return 人员名称 */ private String getDepartmentLeader(String ids) { - if (!isRealTime) { - return ids; - } if (StringUtils.isBlank(ids)) { return ""; }