From aadeaf42d5f428f6840c9b283b49b4f29a3928d1 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Mon, 22 Apr 2024 13:54:28 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-2106):=20=E5=85=A8=E9=83=A8=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E9=83=A8=E4=B8=8B=E6=8C=87=E5=AE=9A=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=E7=B4=A0=E6=9D=90=E6=8A=95=E6=94=BE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nanopart/api/enums/MaterialTargetUserTypeEnum.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/enums/MaterialTargetUserTypeEnum.java b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/enums/MaterialTargetUserTypeEnum.java index cbd8832c..1bf47878 100644 --- a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/enums/MaterialTargetUserTypeEnum.java +++ b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/enums/MaterialTargetUserTypeEnum.java @@ -56,8 +56,13 @@ public enum MaterialTargetUserTypeEnum { if (CollectionUtils.isEmpty(jobCodes)) { return true; + }else { + if (Objects.isNull(loginOuid) || loginOuid == 0 || CollectionUtils.isEmpty(workspaceOuJob.getOuWorkspaceMap().get(loginOuid))){ + return jobCodes.stream().anyMatch(jobCode -> workspaceJobMap.values().stream().anyMatch(jobCodeList -> jobCodeList.contains(jobCode))); + }else { + return workspaceOuJob.getOuWorkspaceMap().get(loginOuid).stream().anyMatch(w -> !CollectionUtils.isEmpty(workspaceJobMap.get(w)) && jobCodes.stream().anyMatch(jobCode -> workspaceJobMap.get(w).contains(jobCode))); + } } - return jobCodes.stream().anyMatch(jobCode -> workspaceJobMap.values().stream().anyMatch(jobCodeList -> jobCodeList.contains(jobCode))); } // 若配置了具体项目部