|
|
@ -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(); |
|
|
|