diff --git a/backend/src/main/java/io/metersphere/api/dto/document/ApiDocumentRequest.java b/backend/src/main/java/io/metersphere/api/dto/document/ApiDocumentRequest.java index adbd944c85..7b9e6459f6 100644 --- a/backend/src/main/java/io/metersphere/api/dto/document/ApiDocumentRequest.java +++ b/backend/src/main/java/io/metersphere/api/dto/document/ApiDocumentRequest.java @@ -20,4 +20,5 @@ public class ApiDocumentRequest { private String type; private String orderCondition; private List apiIdList; + private boolean trashEnable; } diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java index 517e9ae764..4b5b664562 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java @@ -269,6 +269,9 @@ public class ApiAutomationService { } private void deleteApiScenarioReport(List scenarioIds) { + if(scenarioIds == null || scenarioIds.isEmpty()){ + return; + } ApiScenarioReportExample scenarioReportExample = new ApiScenarioReportExample(); scenarioReportExample.createCriteria().andScenarioIdIn(scenarioIds); List list = apiScenarioReportMapper.selectByExample(scenarioReportExample); diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDocumentMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDocumentMapper.xml index 626296a8b5..bcf0d8788c 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDocumentMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDocumentMapper.xml @@ -2,7 +2,13 @@