From 03680e8415c7d8e990ac0f7b4fb4c2fc251fcd67 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 27 Aug 2021 16:05:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=BB=84=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB=E8=87=AA=E5=B7=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/InfoServiceImpl.java     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java
index 1dbb43ad80..df18eaa2c8 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java
@@ -317,6 +317,16 @@ public class InfoServiceImpl extends BaseServiceImpl<InfoDao, InfoEntity> implem
         if (infoReceiverGroupDao.selectCountName(formDTO.getName().trim(),formDTO.getCustomerId(),formDTO.getUserId()) > 1) {
             throw new RenException(EpmetErrorCode.INFO_GROUP_NAME_EXISTS.getCode(), EpmetErrorCode.INFO_GROUP_NAME_EXISTS.getMsg());
         }
+
+        Set<String> members=new LinkedHashSet<String>();
+        members.addAll(formDTO.getStaffIdList());
+        members.addAll(orgStaffIds);
+        if(CollectionUtils.isEmpty(members)&&members.contains(formDTO.getUserId())){
+            members.remove(formDTO.getUserId());
+        }
+        if(CollectionUtils.isEmpty(members)){
+            throw new RenException(EpmetErrorCode.PLEASE_CHOOSE_MEMBER.getCode(), EpmetErrorCode.PLEASE_CHOOSE_MEMBER.getMsg());
+        }
         InfoReceiverGroupEntity groupEntity=new InfoReceiverGroupEntity();
         groupEntity.setCustomerId(formDTO.getCustomerId());
         groupEntity.setName(formDTO.getName());
@@ -324,9 +334,6 @@ public class InfoServiceImpl extends BaseServiceImpl<InfoDao, InfoEntity> implem
         // 4、插入小组表
         infoReceiverGroupDao.insert(groupEntity);
 
-        Set<String> members=new LinkedHashSet<String>();
-        members.addAll(formDTO.getStaffIdList());
-        members.addAll(orgStaffIds);
         members.forEach(memStaffId->{
             // 5、插入群成员表
             InfoGroupReceiversEntity memberEntity=new InfoGroupReceiversEntity();