From 073744aa49614cb92c241e1aede9c1097babce27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 26 Feb 2022 15:48:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xm/core/ctrl/XmProjectGroupUserController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java index c7ac4334..1cd999cd 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java @@ -377,12 +377,12 @@ public class XmProjectGroupUserController { return ResponseHelper.failed("userid-or-groupId-0","请上送用户编号及小组编号"); }else{ for (XmProjectGroupUser gu : gus) { - if(!"1".equals(gu.getPgClass())&&StringUtils.hasText(gu.getProjectId())){ + if(!"1".equals(gu.getPgClass())&&!StringUtils.hasText(gu.getProjectId())){ return ResponseHelper.failed("projectId-0","项目编号不能为空"); - }else{ + }else if("1".equals(gu.getPgClass())&&!StringUtils.hasText(gu.getProductId())) return ResponseHelper.failed("productId-0","产品编号不能为空"); } - } + } List gusDb=this.xmProjectGroupUserService.selectListByIds(gus); //过滤掉已经存在的 @@ -471,7 +471,7 @@ public class XmProjectGroupUserController { groupUsersMap.forEach((groupId,groupUsers)->{ List> users=groupUsers.stream().map(i->map("userid",i.getUserid(),"username",i.getUsername())).collect(Collectors.toList()); - pushMsgService.pushLeaveChannelGroupMsg(user.getBranchId(),groupId, users); + pushMsgService.pushJoinChannelGroupMsg(user.getBranchId(),groupId, users); if("0".equals(pgClass)){ xmProjectGroupService.clearProjectGroup(projectId);