From 15648e026fbe1e276994e234908e5d8833096043 Mon Sep 17 00:00:00 2001 From: zhanghonghao Date: Thu, 13 Mar 2025 15:56:42 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3714):=20=E5=A4=84=E7=90=86=E7=8F=AD?= =?UTF-8?q?=E7=BB=84=E9=95=BF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nodeuser/service/impl/NodeUserCheckServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 963bb37..33a28c1 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 @@ -231,10 +231,12 @@ public class NodeUserCheckServiceImpl implements NodeUserCheckService { } } + Set teamLeadPersonSet = new HashSet<>(); nodeUsers.stream().filter(e -> e.getIdentityType().equals(IdentityType.WORKER_LEADER.getCode())).findAny().ifPresent(e -> { BatchDeleteNodeUserCheckResp.CheckFailInfo checkFailInfo = new BatchDeleteNodeUserCheckResp.CheckFailInfo(); checkFailInfo.setType(CheckInfoTypeEnum.TEAM_LEADER); addFailInfo(failInfoMap, e.getPersonId(), checkFailInfo); + teamLeadPersonSet.add(e.getPersonId()); }); // 判断小组长，小组长不允许删除 @@ -251,6 +253,10 @@ public class NodeUserCheckServiceImpl implements NodeUserCheckService { List saasRoleUserInfo = roleUserGateway.pageAll(roleUserParam); saasRoleUserInfo = saasRoleUserInfo.stream().filter(e -> Objects.nonNull(e.getRole())).collect(Collectors.toList()); saasRoleUserInfo.forEach(e -> { + // 班组长不用校验，因为班组长也会有管理员角色 + if (teamLeadPersonSet.contains(e.getPersonId())) { + return; + } Optional roleTypeEnumOptional = RoleTypeEnum.fromValue(e.getRole().getRoleType()); RoleTypeEnum roleTypeEnum = RoleTypeEnum.AUTO_OWN; if (roleTypeEnumOptional.isPresent()) {