diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java index 02fc8979bd2c186b923ed8fd24e7de5900646c73..384a5cd1903a902ab99d39132aa56eb54c7cd390 100644 --- a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java +++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java @@ -14,6 +14,7 @@ import io.metersphere.api.service.ApiAutomationService; import io.metersphere.api.service.ApiTestEnvironmentService; import io.metersphere.base.domain.ApiScenarioWithBLOBs; import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs; +import io.metersphere.commons.constants.MsTestElementConstants; import io.metersphere.commons.utils.CommonBeanFactory; import io.metersphere.commons.utils.FileUtils; import io.metersphere.commons.utils.SessionUtils; @@ -77,9 +78,9 @@ public class MsScenario extends MsTestElement { if (!config.isOperating() && !this.isEnable()) { return; } - if (this.getReferenced() != null && this.getReferenced().equals("Deleted")) { + if (this.getReferenced() != null && this.getReferenced().equals(MsTestElementConstants.Deleted.name())) { return; - } else if (this.getReferenced() != null && this.getReferenced().equals("REF")) { + } else if (this.getReferenced() != null && MsTestElementConstants.REF.name().equals(this.getReferenced())) { try { ApiAutomationService apiAutomationService = CommonBeanFactory.getBean(ApiAutomationService.class); ObjectMapper mapper = new ObjectMapper(); diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java index 03f2ca46a6aea7ad11296545ca36256803a1e126..6ca67bba170ac7e68f508d91fe428c530a1bbf9f 100644 --- a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java +++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java @@ -160,6 +160,7 @@ public abstract class MsTestElement { mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); ApiDefinitionWithBLOBs apiDefinition = apiDefinitionService.getBLOBs(element.getId()); if (apiDefinition != null) { + element.setProjectId(apiDefinition.getProjectId()); element = mapper.readValue(apiDefinition.getRequest(), new TypeReference() { }); hashTree.add(element); diff --git a/backend/src/main/java/io/metersphere/commons/constants/MsTestElementConstants.java b/backend/src/main/java/io/metersphere/commons/constants/MsTestElementConstants.java index e3e2dbf2325076660e22fe6df8f447ad76ad48e9..81f0415d059df5a21b5e9e40f9e0f8049c1c8e2d 100644 --- a/backend/src/main/java/io/metersphere/commons/constants/MsTestElementConstants.java +++ b/backend/src/main/java/io/metersphere/commons/constants/MsTestElementConstants.java @@ -1,5 +1,5 @@ package io.metersphere.commons.constants; public enum MsTestElementConstants { - LoopController,SCENARIO,REF + LoopController,SCENARIO,REF,Deleted }