diff --git a/src/com/engine/organization/service/impl/JyChartServiceImpl.java b/src/com/engine/organization/service/impl/JyChartServiceImpl.java index 63ddc798..0681c873 100644 --- a/src/com/engine/organization/service/impl/JyChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/JyChartServiceImpl.java @@ -461,7 +461,7 @@ public class JyChartServiceImpl extends Service implements OrgChartService { if (currentLevel < 0) { return; } - rs.executeQuery("select a.id,a.lastname from hrmresource a inner join cus_fielddata b on a.id = b.id and b.scope ='hrmcustomfieldbyinfotype' and b.scopeid ='-1' where b.field100002 = ?", jobId); + rs.executeQuery("select a.id,a.lastname from hrmresource a inner join cus_fielddata b on a.id = b.id and b.scope ='hrmcustomfieldbyinfotype' and b.scopeid ='-1' where a.status < 4 and b.field100002 = ?", jobId); List resourceList = new ArrayList<>(); while (rs.next()) { JyResourceChart item = new JyResourceChart(); diff --git a/src/com/engine/organization/wrapper/OrgChartWrapper.java b/src/com/engine/organization/wrapper/OrgChartWrapper.java index 8ec94b5d..07570986 100644 --- a/src/com/engine/organization/wrapper/OrgChartWrapper.java +++ b/src/com/engine/organization/wrapper/OrgChartWrapper.java @@ -3,7 +3,7 @@ package com.engine.organization.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.organization.service.OrgChartService; -import com.engine.organization.service.impl.OrgChartServiceImpl; +import com.engine.organization.service.impl.JyChartServiceImpl; import weaver.hrm.User; import java.util.Map; @@ -16,7 +16,7 @@ import java.util.Map; **/ public class OrgChartWrapper extends Service { private OrgChartService getOrgChartService(User user) { - return ServiceUtil.getService(OrgChartServiceImpl.class, user); + return ServiceUtil.getService(JyChartServiceImpl.class, user); }