zhangzhiguo
/
zhongcaiguoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

查询台账单，只查询当前公司下的人员

This commit is contained in:
zhangzhiguo 2025-07-22 10:39:16 +08:00
parent 940957083d
commit be399a1454
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/EmpTravelRptQueryPlugin.java
View File

@ -91,8 +91,8 @@ public class EmpTravelRptQueryPlugin extends AbstractReportListDataPlugin {
List<Long> orgIds = new ArrayList<>(); List<Long> orgIds = new ArrayList<>();
orgIds.add(orgId); orgIds.add(orgId);
//获取当前组织的所有下级组织 //获取当前组织的所有下级组织
List<Long> subOrgIds = OrgUnitServiceHelper.getAllSubordinateOrgs(1L, orgIds, true); // List<Long> subOrgIds = OrgUnitServiceHelper.getAllSubordinateOrgs(1L, orgIds, true);
List<Long> allUsersOfOrg = UserServiceHelper.getAllUsersOfOrg(orgIds); List<Long> allUsersOfOrg = UserServiceHelper.getAllUsersOfOrg(orgIds,false);
if(!applierId.isEmpty()){ if(!applierId.isEmpty()){
//通过查询用户过滤组织下的人 //通过查询用户过滤组织下的人
allUsersOfOrg = allUsersOfOrg.stream().filter(applierId::contains).collect(Collectors.toList()); allUsersOfOrg = allUsersOfOrg.stream().filter(applierId::contains).collect(Collectors.toList());

2
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/PositionFeesRptQueryPlugin.java
View File

@ -113,7 +113,7 @@ public class PositionFeesRptQueryPlugin extends AbstractReportListDataPlugin {
//获取公司下的所有人 //获取公司下的所有人
List<Long> orgIds = new ArrayList<>(); List<Long> orgIds = new ArrayList<>();
orgIds.add(orgId); orgIds.add(orgId);
List<Long> allUsersOfOrg = UserServiceHelper.getAllUsersOfOrg(orgIds); List<Long> allUsersOfOrg = UserServiceHelper.getAllUsersOfOrg(orgIds,false);
if(!applierId.isEmpty()){ if(!applierId.isEmpty()){
//通过查询用户过滤组织下的人 //通过查询用户过滤组织下的人
allUsersOfOrg = allUsersOfOrg.stream().filter(applierId::contains).collect(Collectors.toList()); allUsersOfOrg = allUsersOfOrg.stream().filter(applierId::contains).collect(Collectors.toList());