diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java index d6a6ebc3f9..936fcdc441 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java @@ -980,7 +980,7 @@ public class TestPlanReportService { public void delete(QueryTestPlanReportRequest request) { List deleteReportIds = request.getDataIds(); if (request.isSelectAllDate()) { - deleteReportIds = this.getAllApiIdsByFontedSelect(request.getFilters(), request.getName(), request.getProjectId(), request.getUnSelectIds()); + deleteReportIds = this.getAllApiIdsByFontedSelect(request.getFilters(), request.getName(), request.getProjectId(), request.getUnSelectIds(), request.getCombine()); } if (CollectionUtils.isNotEmpty(deleteReportIds)) { TestPlanReportExample deleteReportExample = new TestPlanReportExample(); @@ -998,12 +998,15 @@ public class TestPlanReportService { } } - private List getAllApiIdsByFontedSelect(Map> filters, String name, String projectId, List unSelectIds) { + private List getAllApiIdsByFontedSelect(Map> filters, String name, String projectId, List unSelectIds, Map combine) { QueryTestPlanReportRequest request = new QueryTestPlanReportRequest(); request.setFilters(filters); request.setName(name); request.setProjectId(projectId); request.setWorkspaceId(SessionUtils.getCurrentWorkspaceId()); + if (combine != null) { + request.setCombine(combine); + } List resList = extTestPlanReportMapper.list(request); List ids = new ArrayList<>(0); if (!resList.isEmpty()) {