From 89f2f8169287ba584dd5f981f4de591e99351a04 Mon Sep 17 00:00:00 2001 From: zhanghonghao Date: Wed, 12 Mar 2025 14:08:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3714):=20=E5=A4=84=E7=90=86job?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nodeuser/service/impl/NodeUserCheckServiceImpl.java | 7 +++++-- 1 file changed, 5 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 72ff149..f99246f 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 @@ -135,7 +135,10 @@ public class NodeUserCheckServiceImpl implements NodeUserCheckService { List organizationalNodeUserList = nodeUserService.list(nodeUserQueryVO); Set teamLeader = Sets.newHashSet(); organizationalNodeUserList.forEach(organizationalNodeUserVO -> { - if (IdentityTypeEnum.WORKER_LEADER.getCode().equals(organizationalNodeUserVO.getIdentityType()) || entTeamLeader.equals(organizationalNodeUserVO.getJob().getCode())) { + if (IdentityTypeEnum.WORKER_LEADER.getCode().equals(organizationalNodeUserVO.getIdentityType())) { + teamLeader.add(organizationalNodeUserVO.getPersonId()); + } + if (Objects.nonNull(organizationalNodeUserVO.getJob()) && entTeamLeader.equals(organizationalNodeUserVO.getJob().getCode())) { teamLeader.add(organizationalNodeUserVO.getPersonId()); } }); @@ -471,7 +474,7 @@ public class NodeUserCheckServiceImpl implements NodeUserCheckService { if (Objects.equals(nodeUser.getIdentityType(), IdentityType.PRACTITIONER.getCode())) { return 20; } - if (StrUtil.isBlank(nodeUser.getJob().getCode())) { + if (Objects.isNull(nodeUser.getJob()) || StrUtil.isBlank(nodeUser.getJob().getCode())) { return 9999; } switch (nodeUser.getJob().getCode()) {