From 1fa8f956c1f2bef8285e73a8b63af1a479353cf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Thu, 5 May 2022 09:47:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=80=99=E9=80=89=E4=BA=BA?= =?UTF-8?q?=E5=88=B0=E5=9B=A2=E9=98=9F=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xm/core/ctrl/XmGroupUserController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java index b66ab6d9..83e0ab88 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java @@ -421,6 +421,7 @@ public class XmGroupUserController { Set groupIds=gusNoExists.stream().map(i->i.getGroupId()).collect(Collectors.toSet()); List canAddUsers=new ArrayList<>(); Map> groupUsersMap=new HashMap<>(); + List noQx=new ArrayList<>(); for (String groupId : groupIds) { if("1".equals(pgClass)){ boolean isPm=xmGroupService.checkUserIsProductAdm(xmProduct,user.getUserid()); @@ -451,12 +452,16 @@ public class XmGroupUserController { canAddUsers.addAll(cdus); groupUsersMap.put(groupId,cdus); } + noQx=gus.stream().filter(i->!canAddUsers.stream().filter(k->k.getUserid().equals(i.getUserid()) && k.getGroupId().equals(i.getGroupId())).findAny().isPresent()).collect(Collectors.toList()); List msg=new ArrayList<>(); msg.add("成功新增"+canAddUsers.size()+"个小组用户."); if(canAddUsers.size()>0){ xmGroupUserService.batchInsert(canAddUsers); } - if(canAddUsers.size()0){ + msg.add("不是项目经理、小组长，无权限操作以下"+noQx.size()+"个用户，【"+noQx.stream().map(i->i.getUsername()).collect(Collectors.joining(","))+"】"); + } + if(gusDb.size()>0){ msg.add("以下"+gusDb.size()+"个小组用户已在组里，无需再添加。【"+gusDb.stream().map(i->i.getUsername()).collect(Collectors.joining(","))+"】"); } if(canAddUsers.size()!=0){