diff --git a/backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugService.java b/backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugService.java index 2345a926f7..ebb7e5477c 100644 --- a/backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugService.java +++ b/backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugService.java @@ -1364,9 +1364,22 @@ public class BugService { * @param currentUser 当前用户 */ private void handleRichTextTmpFile(BugEditRequest request, String bugId, String currentUser) { + filterRichTextTmpFile(request); bugAttachmentService.transferTmpFile(bugId, request.getProjectId(), request.getRichTextTmpFileIds(), currentUser, BugAttachmentSourceType.RICH_TEXT.name()); } + /** + * 过滤富文本临时文件 + * + * @param request 请求参数 + */ + private void filterRichTextTmpFile(BugEditRequest request) { + // 项目模板带过来的图片文件不处理 + if (CollectionUtils.isNotEmpty(request.getRichTextTmpFileIds())) { + request.getRichTextTmpFileIds().removeIf(tmpFileId -> request.getDescription().contains("/project/template/img/preview/" + request.getProjectId() + "/" + tmpFileId)); + } + } + /** * 处理并保存缺陷用例关联关系 * diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/service/DeleteCaseReviewService.java b/backend/services/case-management/src/main/java/io/metersphere/functional/service/DeleteCaseReviewService.java index 30e9425a40..88d5233af5 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/service/DeleteCaseReviewService.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/service/DeleteCaseReviewService.java @@ -34,30 +34,30 @@ public class DeleteCaseReviewService { private CaseReviewCaseProvider caseReviewCaseProvider; public void deleteCaseReviewResource(List ids, String projectId) { - //TODO 删除各种关联关系? 1.关联用例(功能/接口/场景/ui/性能)? 2.评审和评审人 3. 归档的用例 4. 关注人 5.评审历史 6. 操作记录 - //1.刪除评审与功能用例关联关系 + // TODO 删除各种关联关系? 1.关联用例(功能/接口/场景/ui/性能)? 2.评审和评审人 3. 归档的用例 4. 关注人 5.评审历史 6. 操作记录 + // 1.刪除评审与功能用例关联关系 CaseReviewFunctionalCaseExample caseReviewFunctionalCaseExample = new CaseReviewFunctionalCaseExample(); caseReviewFunctionalCaseExample.createCriteria().andReviewIdIn(ids); List reviewFunctionalCases = caseReviewFunctionalCaseMapper.selectByExample(caseReviewFunctionalCaseExample); caseReviewFunctionalCaseMapper.deleteByExample(caseReviewFunctionalCaseExample); - //2. 删除评审和评审人 + // 2. 删除评审和评审人 CaseReviewUserExample caseReviewUserExample = new CaseReviewUserExample(); caseReviewUserExample.createCriteria().andReviewIdIn(ids); caseReviewUserMapper.deleteByExample(caseReviewUserExample); - //3. 删除归档的用例 + // 3. 删除归档的用例 CaseReviewFunctionalCaseArchiveExample archiveExample = new CaseReviewFunctionalCaseArchiveExample(); archiveExample.createCriteria().andReviewIdIn(ids); caseReviewFunctionalCaseArchiveMapper.deleteByExample(archiveExample); - //5.删除评审历史 + // 5.删除评审历史 CaseReviewHistoryExample caseReviewHistoryExample = new CaseReviewHistoryExample(); caseReviewHistoryExample.createCriteria().andReviewIdIn(ids); caseReviewHistoryMapper.deleteByExample(caseReviewHistoryExample); - //4.删除关注人 + // 4.删除关注人 CaseReviewFollowerExample caseReviewFollowerExample = new CaseReviewFollowerExample(); caseReviewFollowerExample.createCriteria().andReviewIdIn(ids); caseReviewFollowerMapper.deleteByExample(caseReviewFollowerExample); - //TODO: 6.删除操作记录 + // TODO: 6.删除操作记录 //删除评审 CaseReviewExample caseReviewExample = new CaseReviewExample(); caseReviewExample.createCriteria().andIdIn(ids).andProjectIdEqualTo(projectId);