From be399a1454d5ab00fbfc84cc9c4494fe25097123 Mon Sep 17 00:00:00 2001 From: zhangzhiguo <421587375@qq.com> Date: Tue, 22 Jul 2025 10:39:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=B0=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=89=8D=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E4=B8=8B=E7=9A=84=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcdev/zcdev/fs/plugin/report/EmpTravelRptQueryPlugin.java | 4 ++-- .../zcdev/fs/plugin/report/PositionFeesRptQueryPlugin.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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());