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 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 members=new LinkedHashSet(); + 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 implem // 4、插入小组表 infoReceiverGroupDao.insert(groupEntity); - Set members=new LinkedHashSet(); - members.addAll(formDTO.getStaffIdList()); - members.addAll(orgStaffIds); members.forEach(memStaffId->{ // 5、插入群成员表 InfoGroupReceiversEntity memberEntity=new InfoGroupReceiversEntity();