From 3ef0b06d619dceb6926dac14336c6663b4f421d8 Mon Sep 17 00:00:00 2001 From: zhanghonghao Date: Wed, 9 Apr 2025 19:55:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(REQ-3714):=20=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E4=BA=BA=E8=A2=AB=E5=88=A0=E4=BA=86=EF=BC=8C=E5=B0=B1=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E9=87=8D=E6=96=B0=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/nodeuser/service/impl/NodeUserCheckServiceImpl.java | 3 ++- .../service/processor/impl/DeletePlatTeamWorkerProcessor.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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..b598c65 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 @@ -39,6 +39,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -406,7 +407,7 @@ public class NodeUserCheckServiceImpl implements NodeUserCheckService { } throw ResultCode.INVALID_PARAMS.toException("你已经被移出该企业/项目，请及时联系管理员；你可以退出登录或切换到其他企业/项目使用"); } - if (CollUtil.isEmpty(targets)) { + if (ObjectUtils.anyNull(targets)) { throw ResultCode.INVALID_PARAMS.toException("操作对象已经被移出该企业/项目，请刷新页面重新操作"); } 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); }); } From 27b4fc2699803ff3bb7f6fa8467114237df2fd3c Mon Sep 17 00:00:00 2001 From: zhanghonghao Date: Wed, 9 Apr 2025 20:01:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(REQ-3714):=20=E6=8A=8A=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=9A=84=E4=BA=BA=E8=BF=87=E6=BB=A4=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/NodeUserCheckServiceImpl.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) 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 b598c65..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 @@ -39,11 +39,20 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; 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; @@ -392,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 = {} " @@ -407,7 +417,7 @@ public class NodeUserCheckServiceImpl implements NodeUserCheckService { } throw ResultCode.INVALID_PARAMS.toException("你已经被移出该企业/项目，请及时联系管理员；你可以退出登录或切换到其他企业/项目使用"); } - if (ObjectUtils.anyNull(targets)) { + if (CollUtil.isEmpty(targets)) { throw ResultCode.INVALID_PARAMS.toException("操作对象已经被移出该企业/项目，请刷新页面重新操作"); }