From 3b989a0246ee0e2e7f3ffde1a39512b0312f36f9 Mon Sep 17 00:00:00 2001
From: chenwenjian <chenwenjian@axzo.cn>
Date: Fri, 19 Apr 2024 13:42:50 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-2106):=20=E7=B4=A0=E6=9D=90=E6=8A=95?=
 =?UTF-8?q?=E6=94=BE=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nanopart/api/enums/MaterialTargetUserTypeEnum.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 fe0b1991..d1cdd0a6 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
@@ -37,9 +37,9 @@ public enum MaterialTargetUserTypeEnum {
         public boolean isDeliverRequired(List<Long> workspaceIds, List<Long> ouIds, List<String> jobCodes, JoinedWorkspaceOuJob workspaceOuJob) {
             // 若workspaceIds和jobCodes都为空，则表示不限制，否则需要满足配置的workspaceIds和jobCodes与用户加入的workspaceJob的key，value均存在交集
             Map<Long, List<String>> workspaceJobMap = workspaceOuJob.getWorkspaceJobMap();
-            log.info("投放项目部：{}，投放岗位岗位：{}，用户加入项目部及担任岗位：{}", JSONUtil.toJsonStr(workspaceIds),JSONUtil.toJsonStr(jobCodes),JSONUtil.toJsonStr(workspaceJobMap));
+            log.info("投放项目部：{}，投放岗位岗位：{}，用户加入项目部及担任岗位：{}", JSONUtil.toJsonStr(workspaceIds), JSONUtil.toJsonStr(jobCodes), JSONUtil.toJsonStr(workspaceJobMap));
             return CollectionUtils.isEmpty(workspaceIds) ? CollectionUtils.isEmpty(jobCodes) || jobCodes.stream().anyMatch(jobCode -> workspaceJobMap.values().stream().flatMap(List::stream).distinct().collect(Collectors.toList()).contains(jobCode))
-                    : workspaceIds.stream().anyMatch(workspaceId -> workspaceJobMap.get(workspaceId).stream().anyMatch(jobCodes::contains));
+                    : workspaceIds.stream().anyMatch(workspaceId -> CollectionUtils.isEmpty(jobCodes) || workspaceJobMap.get(workspaceId).stream().anyMatch(jobCodes::contains));
         }
     },
 
@@ -48,9 +48,9 @@ public enum MaterialTargetUserTypeEnum {
         public boolean isDeliverRequired(List<Long> workspaceIds, List<Long> ouIds, List<String> jobCodes, JoinedWorkspaceOuJob workspaceOuJob) {
             // 若workspaceIds和jobCodes都为空，则表示不限制，否则需要满足配置的workspaceIds和jobCodes与用户加入的workspaceJob的key，value均存在交集
             Map<Long, List<String>> ouJobMap = workspaceOuJob.getOuJobMap();
-            log.info("投放单位：{}，投放岗位岗位：{}，用户加入单位及担任岗位：{}", JSONUtil.toJsonStr(workspaceIds),JSONUtil.toJsonStr(jobCodes),JSONUtil.toJsonStr(ouJobMap));
+            log.info("投放单位：{}，投放岗位岗位：{}，用户加入单位及担任岗位：{}", JSONUtil.toJsonStr(workspaceIds), JSONUtil.toJsonStr(jobCodes), JSONUtil.toJsonStr(ouJobMap));
             return CollectionUtils.isEmpty(ouIds) ? CollectionUtils.isEmpty(jobCodes) || jobCodes.stream().anyMatch(jobCode -> ouJobMap.values().stream().flatMap(List::stream).distinct().collect(Collectors.toList()).contains(jobCode))
-                    : ouIds.stream().anyMatch(ouId -> ouJobMap.get(ouId).stream().anyMatch(jobCodes::contains));
+                    : ouIds.stream().anyMatch(ouId -> CollectionUtils.isEmpty(jobCodes) || ouJobMap.get(ouId).stream().anyMatch(jobCodes::contains));
         }
     };