Merge branch 'dev/feat/partner1.6_20231226' into pre

This commit is contained in:
苏竹红
2023-12-26 14:30:22 +08:00

View File

@@ -843,13 +843,9 @@ public class ExhibitionServiceImpl implements ExhibitionService {
private void batchInsertExhibition(ExhibitionGroupDTO exhibitionGroupDTO,List<HyExhibitionDO> insertList,LoginUserInfo userInfo) throws ApiException {
hyExhibitionDAO.batchInsert(insertList);
//新增之后 发送消息通知 防止通知已发送 数据出现回滚
for (ExhibitionDTO exhibitionDTO : exhibitionGroupDTO.getExhibitionList()){
//更新不需要 发送工作通知
if (exhibitionDTO.getId()!=null){
continue;
}
if (CollectionUtils.isNotEmpty(exhibitionDTO.getCollaborators())){
List<String> userIds = exhibitionDTO.getCollaborators().stream().map(CollaboratorDTO::getCollaborateId).collect(Collectors.toList());
for (HyExhibitionDO exhibitionDTO : insertList){
if (StringUtils.isNotEmpty(exhibitionDTO.getCollaborators())){
List<String> userIds = Arrays.asList(exhibitionDTO.getCollaborators().substring(1).split(","));
List<String> userIdsByUserIds = enterpriseUserDAO.getFeishuUserIdListByUserIds(userIds);
eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.EXHIBITION_COLLABORATOR,
userIdsByUserIds,