diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/EmpTravelRptQueryPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/EmpTravelRptQueryPlugin.java index cf9d5c5..9ba1e88 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/EmpTravelRptQueryPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/EmpTravelRptQueryPlugin.java @@ -91,8 +91,8 @@ public class EmpTravelRptQueryPlugin extends AbstractReportListDataPlugin { List orgIds = new ArrayList<>(); orgIds.add(orgId); //获取当前组织的所有下级组织 - List subOrgIds = OrgUnitServiceHelper.getAllSubordinateOrgs(1L, orgIds, true); - List allUsersOfOrg = UserServiceHelper.getAllUsersOfOrg(orgIds); + // List subOrgIds = OrgUnitServiceHelper.getAllSubordinateOrgs(1L, orgIds, true); + List allUsersOfOrg = UserServiceHelper.getAllUsersOfOrg(orgIds,false); if(!applierId.isEmpty()){ //通过查询用户过滤组织下的人 allUsersOfOrg = allUsersOfOrg.stream().filter(applierId::contains).collect(Collectors.toList()); diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/PositionFeesRptQueryPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/PositionFeesRptQueryPlugin.java index 7085f1e..dc13d80 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/PositionFeesRptQueryPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/PositionFeesRptQueryPlugin.java @@ -113,7 +113,7 @@ public class PositionFeesRptQueryPlugin extends AbstractReportListDataPlugin { //获取公司下的所有人 List orgIds = new ArrayList<>(); orgIds.add(orgId); - List allUsersOfOrg = UserServiceHelper.getAllUsersOfOrg(orgIds); + List allUsersOfOrg = UserServiceHelper.getAllUsersOfOrg(orgIds,false); if(!applierId.isEmpty()){ //通过查询用户过滤组织下的人 allUsersOfOrg = allUsersOfOrg.stream().filter(applierId::contains).collect(Collectors.toList());