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 11:11:37 +08:00 committed by Craftsman
parent 104d472d82
commit 01bdeaf03b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/services/project-management/src/main/java/io/metersphere/project/service/NoticeMessageTaskService.java
View File

@ -470,16 +470,19 @@ public class NoticeMessageTaskService {
public List<OptionDTO> getUserList(String projectId, String keyword) { public List<OptionDTO> getUserList(String projectId, String keyword) {
List<OptionDTO> projectUserSelectList = extProjectUserRoleMapper.getProjectUserSelectList(projectId, keyword); List<OptionDTO> projectUserSelectList = extProjectUserRoleMapper.getProjectUserSelectList(projectId, keyword);
ArrayList<OptionDTO> collect = projectUserSelectList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(OptionDTO::getId))), ArrayList::new));
Map<String, String> defaultRelatedUserMap = MessageTemplateUtils.getDefaultRelatedUserMap(); Map<String, String> defaultRelatedUserMap = MessageTemplateUtils.getDefaultRelatedUserMap();
defaultRelatedUserMap.forEach((k, v) -> { defaultRelatedUserMap.forEach((k, v) -> {
OptionDTO optionDTO = new OptionDTO(); OptionDTO optionDTO = new OptionDTO();
optionDTO.setId(k); optionDTO.setId(k);
optionDTO.setName(v); optionDTO.setName(v);
projectUserSelectList.add(optionDTO); collect.add(optionDTO);
}); });
return projectUserSelectList; return collect;
} }
public MessageTemplateConfigDTO getTemplateDetail(String projectId, String taskType, String event, String robotId) { public MessageTemplateConfigDTO getTemplateDetail(String projectId, String taskType, String event, String robotId) {
MessageTaskExample messageTaskExample = new MessageTaskExample(); MessageTaskExample messageTaskExample = new MessageTaskExample();
messageTaskExample.createCriteria().andProjectIdEqualTo(projectId).andTaskTypeEqualTo(taskType).andEventEqualTo(event); messageTaskExample.createCriteria().andProjectIdEqualTo(projectId).andTaskTypeEqualTo(taskType).andEventEqualTo(event);