diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseNoticeService.java b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseNoticeService.java index 3689f90a64..d68f1026b8 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseNoticeService.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseNoticeService.java @@ -154,8 +154,8 @@ public class FunctionalCaseNoticeService { if (customField == null) { continue; } - optionDTO.setId(customField.getId()); - optionDTO.setName(customField.getName()); + optionDTO.setId(customField.getName()); + optionDTO.setName(customFieldDTO.getValue()); fields.add(optionDTO); } } @@ -195,7 +195,7 @@ public class FunctionalCaseNoticeService { } public Map copyBaseCaseInfo(String projectId, List ids) { FunctionalCaseExample example = new FunctionalCaseExample(); - example.createCriteria().andProjectIdEqualTo(projectId).andDeletedEqualTo(false).andIdIn(ids); + example.createCriteria().andProjectIdEqualTo(projectId).andIdIn(ids); List functionalCaseLists = functionalCaseMapper.selectByExample(example); return functionalCaseLists.stream().collect(Collectors.toMap(FunctionalCase::getId, functionalCase -> functionalCase)); } diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/notice/sender/AbstractNoticeSender.java b/backend/services/system-setting/src/main/java/io/metersphere/system/notice/sender/AbstractNoticeSender.java index 4c6532b5a0..dacdb9b69b 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/notice/sender/AbstractNoticeSender.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/notice/sender/AbstractNoticeSender.java @@ -168,10 +168,10 @@ public abstract class AbstractNoticeSender implements NoticeSender { } // 去重复 - List userIds = toUsers.stream().map(Receiver::getUserId).distinct().toList(); + List userIds = toUsers.stream().map(Receiver::getUserId).toList(); LogUtils.info("userIds: ", JSON.toJSONString(userIds)); List users = getUsers(userIds, messageDetail.getProjectId()); - List realUserIds = users.stream().map(User::getId).toList(); + List realUserIds = users.stream().map(User::getId).distinct().toList(); return toUsers.stream().filter(t -> realUserIds.contains(t.getUserId())).toList(); } diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/notice/utils/MessageTemplateUtils.java b/backend/services/system-setting/src/main/java/io/metersphere/system/notice/utils/MessageTemplateUtils.java index 25c976e6d5..6ae3bece2a 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/notice/utils/MessageTemplateUtils.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/notice/utils/MessageTemplateUtils.java @@ -188,7 +188,8 @@ public class MessageTemplateUtils { // 处理人相关的数据 handleUser(context); StringSubstitutor sub = new StringSubstitutor(context); - return sub.replace(template); + String replace = sub.replace(template); + return replace; } public static void handleTime(Map context) { diff --git a/frontend/src/components/business/ms-case-associate/index.vue b/frontend/src/components/business/ms-case-associate/index.vue index 54312cd507..c3be0d7f50 100644 --- a/frontend/src/components/business/ms-case-associate/index.vue +++ b/frontend/src/components/business/ms-case-associate/index.vue @@ -597,6 +597,7 @@ version: '', }; activeFolder.value = 'all'; + activeFolderName.value = t('ms.case.associate.allCase'); resetSelector(); emit('close'); }