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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
song.tianyang 2021-03-25 15:25:03 +08:00
parent 38f994c3df 4eac6ed970
commit bd351f1c3e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
View File

@ -269,7 +269,7 @@ public class ApiAutomationService {
} }
private void deleteApiScenarioReport(List<String> scenarioIds) { private void deleteApiScenarioReport(List<String> scenarioIds) {
if(scenarioIds == null || scenarioIds.isEmpty()){ if (scenarioIds == null || scenarioIds.isEmpty()) {
return; return;
} }
ApiScenarioReportExample scenarioReportExample = new ApiScenarioReportExample(); ApiScenarioReportExample scenarioReportExample = new ApiScenarioReportExample();
@ -371,6 +371,9 @@ public class ApiAutomationService {
public APIScenarioReportResult createScenarioReport(String id, String scenarioId, String scenarioName, String triggerMode, String execType, String projectId, String userID) { public APIScenarioReportResult createScenarioReport(String id, String scenarioId, String scenarioName, String triggerMode, String execType, String projectId, String userID) {
APIScenarioReportResult report = new APIScenarioReportResult(); APIScenarioReportResult report = new APIScenarioReportResult();
if (triggerMode.equals(ApiRunMode.SCENARIO.name()) || triggerMode.equals(ApiRunMode.DEFINITION.name())) {
triggerMode = ReportTriggerMode.MANUAL.name();
}
report.setId(id); report.setId(id);
report.setTestId(id); report.setTestId(id);
if (StringUtils.isNotEmpty(scenarioName)) { if (StringUtils.isNotEmpty(scenarioName)) {

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 2115bd28a90854d2b6276a90878934715498c584 Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd