diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserCheckServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserCheckServiceImpl.java index deba245..594c44e 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserCheckServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserCheckServiceImpl.java @@ -42,7 +42,17 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; import java.util.function.ToIntFunction; import java.util.stream.Collectors; @@ -391,6 +401,7 @@ public class NodeUserCheckServiceImpl implements NodeUserCheckService { .filter(nu -> Objects.equals(nu.getPersonId(), personId)) .min(Comparator.comparingInt(NODE_USER_PRIORITY_RESOLVER)) .orElse(null)) + .filter(Objects::nonNull) .collect(Collectors.toList()); log.info("## checkUserOperate, param = {}, operator = {}, targets = {}, nodeUsers = {} " diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/impl/DeletePlatTeamWorkerProcessor.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/impl/DeletePlatTeamWorkerProcessor.java index ef9cc36..3052787 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/impl/DeletePlatTeamWorkerProcessor.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/impl/DeletePlatTeamWorkerProcessor.java @@ -171,7 +171,7 @@ public class DeletePlatTeamWorkerProcessor implements NodeUserProcessor { sendWorkerMessage(ouRelation, vs); return; } - log.error("获取企业下班组与平台班组关系失败, nodeId:{}", nodeId); + log.warn("获取企业下班组与平台班组关系失败, nodeId:{}", nodeId); }); }