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

fix(缺陷管理): 项目模板缺陷内容默认值带有图片保存报错问题

This commit is contained in:
song-cc-rock 2024-08-22 11:45:25 +08:00 committed by Craftsman
parent 36e7c48b1c
commit 54b6c1d53a
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugService.java
View File

@ -1364,9 +1364,22 @@ public class BugService {
* @param currentUser 当前用户 * @param currentUser 当前用户
*/ */
private void handleRichTextTmpFile(BugEditRequest request, String bugId, String currentUser) { private void handleRichTextTmpFile(BugEditRequest request, String bugId, String currentUser) {
filterRichTextTmpFile(request);
bugAttachmentService.transferTmpFile(bugId, request.getProjectId(), request.getRichTextTmpFileIds(), currentUser, BugAttachmentSourceType.RICH_TEXT.name()); 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));
}
}
/** /**
* 处理并保存缺陷用例关联关系 * 处理并保存缺陷用例关联关系
* *

14
backend/services/case-management/src/main/java/io/metersphere/functional/service/DeleteCaseReviewService.java
View File

@ -34,30 +34,30 @@ public class DeleteCaseReviewService {
private CaseReviewCaseProvider caseReviewCaseProvider; private CaseReviewCaseProvider caseReviewCaseProvider;
public void deleteCaseReviewResource(List<String> ids, String projectId) { public void deleteCaseReviewResource(List<String> ids, String projectId) {
//TODO 删除各种关联关系？ 1.关联用例(功能/接口/场景/ui/性能)？ 2.评审和评审人 3. 归档的用例 4. 关注人 5.评审历史 6. 操作记录 // TODO 删除各种关联关系？ 1.关联用例(功能/接口/场景/ui/性能)？ 2.评审和评审人 3. 归档的用例 4. 关注人 5.评审历史 6. 操作记录
//1.刪除评审与功能用例关联关系 // 1.刪除评审与功能用例关联关系
CaseReviewFunctionalCaseExample caseReviewFunctionalCaseExample = new CaseReviewFunctionalCaseExample(); CaseReviewFunctionalCaseExample caseReviewFunctionalCaseExample = new CaseReviewFunctionalCaseExample();
caseReviewFunctionalCaseExample.createCriteria().andReviewIdIn(ids); caseReviewFunctionalCaseExample.createCriteria().andReviewIdIn(ids);
List<CaseReviewFunctionalCase> reviewFunctionalCases = caseReviewFunctionalCaseMapper.selectByExample(caseReviewFunctionalCaseExample); List<CaseReviewFunctionalCase> reviewFunctionalCases = caseReviewFunctionalCaseMapper.selectByExample(caseReviewFunctionalCaseExample);
caseReviewFunctionalCaseMapper.deleteByExample(caseReviewFunctionalCaseExample); caseReviewFunctionalCaseMapper.deleteByExample(caseReviewFunctionalCaseExample);
//2. 删除评审和评审人 // 2. 删除评审和评审人
CaseReviewUserExample caseReviewUserExample = new CaseReviewUserExample(); CaseReviewUserExample caseReviewUserExample = new CaseReviewUserExample();
caseReviewUserExample.createCriteria().andReviewIdIn(ids); caseReviewUserExample.createCriteria().andReviewIdIn(ids);
caseReviewUserMapper.deleteByExample(caseReviewUserExample); caseReviewUserMapper.deleteByExample(caseReviewUserExample);
//3. 删除归档的用例 // 3. 删除归档的用例
CaseReviewFunctionalCaseArchiveExample archiveExample = new CaseReviewFunctionalCaseArchiveExample(); CaseReviewFunctionalCaseArchiveExample archiveExample = new CaseReviewFunctionalCaseArchiveExample();
archiveExample.createCriteria().andReviewIdIn(ids); archiveExample.createCriteria().andReviewIdIn(ids);
caseReviewFunctionalCaseArchiveMapper.deleteByExample(archiveExample); caseReviewFunctionalCaseArchiveMapper.deleteByExample(archiveExample);
//5.删除评审历史 // 5.删除评审历史
CaseReviewHistoryExample caseReviewHistoryExample = new CaseReviewHistoryExample(); CaseReviewHistoryExample caseReviewHistoryExample = new CaseReviewHistoryExample();
caseReviewHistoryExample.createCriteria().andReviewIdIn(ids); caseReviewHistoryExample.createCriteria().andReviewIdIn(ids);
caseReviewHistoryMapper.deleteByExample(caseReviewHistoryExample); caseReviewHistoryMapper.deleteByExample(caseReviewHistoryExample);
//4.删除关注人 // 4.删除关注人
CaseReviewFollowerExample caseReviewFollowerExample = new CaseReviewFollowerExample(); CaseReviewFollowerExample caseReviewFollowerExample = new CaseReviewFollowerExample();
caseReviewFollowerExample.createCriteria().andReviewIdIn(ids); caseReviewFollowerExample.createCriteria().andReviewIdIn(ids);
caseReviewFollowerMapper.deleteByExample(caseReviewFollowerExample); caseReviewFollowerMapper.deleteByExample(caseReviewFollowerExample);
//TODO: 6.删除操作记录 // TODO: 6.删除操作记录
//删除评审 //删除评审
CaseReviewExample caseReviewExample = new CaseReviewExample(); CaseReviewExample caseReviewExample = new CaseReviewExample();
caseReviewExample.createCriteria().andIdIn(ids).andProjectIdEqualTo(projectId); caseReviewExample.createCriteria().andIdIn(ids).andProjectIdEqualTo(projectId);