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:
WangXu10 2023-12-18 17:04:03 +08:00 committed by Craftsman
parent aa9a98d829
commit 9c28dd2fa4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,8 +151,6 @@ public class FunctionalCaseAttachmentService {
FunctionalCaseAttachmentExample example = new FunctionalCaseAttachmentExample(); FunctionalCaseAttachmentExample example = new FunctionalCaseAttachmentExample();
example.createCriteria().andFileIdIn(deleteFileMetaIds).andCaseIdEqualTo(caseId).andLocalEqualTo(true); example.createCriteria().andFileIdIn(deleteFileMetaIds).andCaseIdEqualTo(caseId).andLocalEqualTo(true);
List<FunctionalCaseAttachment> delAttachment = functionalCaseAttachmentMapper.selectByExample(example); List<FunctionalCaseAttachment> delAttachment = functionalCaseAttachmentMapper.selectByExample(example);
example.clear();
example.createCriteria().andIdIn(deleteFileMetaIds);
functionalCaseAttachmentMapper.deleteByExample(example); functionalCaseAttachmentMapper.deleteByExample(example);
this.deleteMinioFile(delAttachment, projectId, caseId); this.deleteMinioFile(delAttachment, projectId, caseId);
} }

4
backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectApplicationController.java
View File

@ -180,7 +180,7 @@ public class ProjectApplicationController {
@RequiresPermissions(PermissionConstants.PROJECT_APPLICATION_CASE_READ) @RequiresPermissions(PermissionConstants.PROJECT_APPLICATION_CASE_READ)
public Map<String, Object> getCase(@Validated @RequestBody ProjectApplicationRequest request) { public Map<String, Object> getCase(@Validated @RequestBody ProjectApplicationRequest request) {
List<String> types = Arrays.asList(ProjectApplicationType.CASE.values()).stream().map(ProjectApplicationType.CASE::name).collect(Collectors.toList()); List<String> types = Arrays.asList(ProjectApplicationType.CASE.values()).stream().map(ProjectApplicationType.CASE::name).collect(Collectors.toList());
types.add(ProjectApplicationType.CASE_RELATED_CONFIG.CASE_RELATED.name() + ProjectApplicationType.CASE_RELATED_CONFIG.CASE_ENABLE.name()); types.add(ProjectApplicationType.CASE_RELATED_CONFIG.CASE_RELATED.name() + "_" + ProjectApplicationType.CASE_RELATED_CONFIG.CASE_ENABLE.name());
return projectApplicationService.get(request, types); return projectApplicationService.get(request, types);
} }
@ -260,7 +260,7 @@ public class ProjectApplicationController {
@Operation(summary = "缺陷管理-获取配置") @Operation(summary = "缺陷管理-获取配置")
@RequiresPermissions(PermissionConstants.PROJECT_APPLICATION_BUG_READ) @RequiresPermissions(PermissionConstants.PROJECT_APPLICATION_BUG_READ)
public Map<String, Object> getBug(@Validated @RequestBody ProjectApplicationRequest request) { public Map<String, Object> getBug(@Validated @RequestBody ProjectApplicationRequest request) {
List<String> types = Arrays.asList(ProjectApplicationType.BUG.BUG_SYNC.name() + ProjectApplicationType.BUG_SYNC_CONFIG.SYNC_ENABLE.name()); List<String> types = Arrays.asList(ProjectApplicationType.BUG.BUG_SYNC.name() + "_" + ProjectApplicationType.BUG_SYNC_CONFIG.SYNC_ENABLE.name());
return projectApplicationService.get(request, types); return projectApplicationService.get(request, types);
} }