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

fix(测试计划): 报告批量删除问题 

--bug=1009499 --user=lyh
【github#9167】测试计划报告批量删除功能bug
https://www.tapd.cn/55049933/s/1090099

Closes #9167
This commit is contained in:
shiziyuan9527 2022-01-10 18:07:19 +08:00 committed by 刘瑞斌
parent 0283f7b38d
commit 44e4711644
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
View File

@ -980,7 +980,7 @@ public class TestPlanReportService {
public void delete(QueryTestPlanReportRequest request) { public void delete(QueryTestPlanReportRequest request) {
List<String> deleteReportIds = request.getDataIds(); List<String> deleteReportIds = request.getDataIds();
if (request.isSelectAllDate()) { 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)) { if (CollectionUtils.isNotEmpty(deleteReportIds)) {
TestPlanReportExample deleteReportExample = new TestPlanReportExample(); TestPlanReportExample deleteReportExample = new TestPlanReportExample();
@ -998,12 +998,15 @@ public class TestPlanReportService {
} }
} }
private List<String> getAllApiIdsByFontedSelect(Map<String, List<String>> filters, String name, String projectId, List<String> unSelectIds) { private List<String> getAllApiIdsByFontedSelect(Map<String, List<String>> filters, String name, String projectId, List<String> unSelectIds, Map<String, Object> combine) {
QueryTestPlanReportRequest request = new QueryTestPlanReportRequest(); QueryTestPlanReportRequest request = new QueryTestPlanReportRequest();
request.setFilters(filters); request.setFilters(filters);
request.setName(name); request.setName(name);
request.setProjectId(projectId); request.setProjectId(projectId);
request.setWorkspaceId(SessionUtils.getCurrentWorkspaceId()); request.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
if (combine != null) {
request.setCombine(combine);
}
List<TestPlanReportDTO> resList = extTestPlanReportMapper.list(request); List<TestPlanReportDTO> resList = extTestPlanReportMapper.list(request);
List<String> ids = new ArrayList<>(0); List<String> ids = new ArrayList<>(0);
if (!resList.isEmpty()) { if (!resList.isEmpty()) {