test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(项目管理): 消息通知判断是否发送自己

This commit is contained in:
guoyuqi 2024-02-06 13:23:23 +08:00 committed by 刘瑞斌
parent 60492f0c34
commit 104d472d82
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/services/system-setting/src/main/java/io/metersphere/system/notice/sender/SendNoticeAspect.java
View File

@ -148,8 +148,8 @@ public class SendNoticeAspect {
SessionUser sessionUser = SessionUtils.getUser(); SessionUser sessionUser = SessionUtils.getUser();
String currentProjectId = SessionUtils.getCurrentProjectId(); String currentProjectId = SessionUtils.getCurrentProjectId();
LogUtils.info("event:"+event); LogUtils.info("event:" + event);
afterReturningNoticeSendService.sendNotice(taskType,event, resources, sessionUser, currentProjectId); afterReturningNoticeSendService.sendNotice(taskType, event, resources, sessionUser, currentProjectId);
} catch (Exception e) { } catch (Exception e) {
LogUtils.error(e.getMessage(), e); LogUtils.error(e.getMessage(), e);
} finally { } finally {

14
backend/services/system-setting/src/main/java/io/metersphere/system/notice/sender/impl/InSiteNoticeSender.java
View File

@ -2,13 +2,13 @@ package io.metersphere.system.notice.sender.impl;
import io.metersphere.project.domain.Notification; import io.metersphere.project.domain.Notification;
import io.metersphere.system.notice.constants.NotificationConstants; import io.metersphere.sdk.util.LogUtils;
import io.metersphere.system.notice.MessageDetail; import io.metersphere.system.notice.MessageDetail;
import io.metersphere.system.notice.NoticeModel; import io.metersphere.system.notice.NoticeModel;
import io.metersphere.system.notice.Receiver; import io.metersphere.system.notice.Receiver;
import io.metersphere.system.notice.constants.NotificationConstants;
import io.metersphere.system.notice.sender.AbstractNoticeSender; import io.metersphere.system.notice.sender.AbstractNoticeSender;
import io.metersphere.system.service.NotificationService; import io.metersphere.system.service.NotificationService;
import io.metersphere.sdk.util.LogUtils;
import io.metersphere.system.uid.IDGenerator; import io.metersphere.system.uid.IDGenerator;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
@ -29,14 +29,16 @@ public class InSiteNoticeSender extends AbstractNoticeSender {
List<Receiver> receivers = noticeModel.getReceivers(); List<Receiver> receivers = noticeModel.getReceivers();
// 排除自己 // 排除自己
List<Receiver> realReceivers = new ArrayList<>(); List<Receiver> realReceivers = new ArrayList<>();
for (Receiver receiver : receivers) { if (noticeModel.isExcludeSelf() ) {
if (!StringUtils.equals(receiver.getUserId(), noticeModel.getOperator())) { for (Receiver receiver : receivers) {
realReceivers.add(receiver); if (!StringUtils.equals(receiver.getUserId(), noticeModel.getOperator())) {
LogUtils.info("发送人是自己不发");
realReceivers.add(receiver);
}
} }
} }
if (CollectionUtils.isEmpty(realReceivers)) { if (CollectionUtils.isEmpty(realReceivers)) {
LogUtils.info("发送人是自己不发");
return; return;
} }