From f97bd3e0ae3a6ccce9bd3d25390e3535d148d514 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Fri, 10 Apr 2026 17:42:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=8E=BB=E9=99=A4=E6=8E=89=E7=9D=A3?= =?UTF-8?q?=E5=AE=A1=E6=94=AF=E9=98=9F=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/report/ReportProjectController.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/biutag/supervision/controller/report/ReportProjectController.java b/src/main/java/com/biutag/supervision/controller/report/ReportProjectController.java index 98ea2bb..242c687 100644 --- a/src/main/java/com/biutag/supervision/controller/report/ReportProjectController.java +++ b/src/main/java/com/biutag/supervision/controller/report/ReportProjectController.java @@ -63,6 +63,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.function.Consumer; +import java.util.stream.Collectors; import static com.biutag.supervision.constants.AppConstants.ROOTID; @@ -252,16 +253,19 @@ public class ReportProjectController { if (!superAuth) { wrapper.and(p -> p.in("p.audit_unit_id", userAuthOrgIds).or().in("p.project_unit_id", userAuthOrgIds)); } + List dszdOrgIds = departService.getAllNodeIds(AppConstants.DSZD); // 页面鉴权 Map>> authStrategy = Map.of( // “审计单位”为督审支队的项目 "dszd", w -> { - List dszdOrgIds = departService.getAllNodeIds(AppConstants.DSZD); w.and(p -> p.in("p.audit_unit_id", dszdOrgIds)); }, - // 内“审计单位”为各分县市局内审的项目 + // 内“审计单位”为各分县市局内审的项目,还要去除督审支队 "self", w -> { - w.and(p -> p.in("p.audit_unit_id", userAuthOrgIds)); + List filteredUserAuthOrgIds = userAuthOrgIds.stream() + .filter(id -> !dszdOrgIds.contains(id)) + .collect(Collectors.toList()); + w.and(p -> p.in("p.audit_unit_id", filteredUserAuthOrgIds)); // w.and(p -> p.in("p.audit_unit_id", userAuthOrgIds).or().in("p.project_unit_id", userAuthOrgIds)); } );