diff --git a/api-test/backend/src/main/java/io/metersphere/service/plan/TestPlanScenarioCaseService.java b/api-test/backend/src/main/java/io/metersphere/service/plan/TestPlanScenarioCaseService.java index 80bf059ce3..8c15bd5af5 100644 --- a/api-test/backend/src/main/java/io/metersphere/service/plan/TestPlanScenarioCaseService.java +++ b/api-test/backend/src/main/java/io/metersphere/service/plan/TestPlanScenarioCaseService.java @@ -41,6 +41,7 @@ import io.metersphere.service.plan.remote.TestPlanService; import io.metersphere.service.scenario.ApiScenarioModuleService; import io.metersphere.service.scenario.ApiScenarioReportService; import io.metersphere.service.scenario.ApiScenarioService; +import jakarta.annotation.Resource; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; @@ -52,7 +53,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import jakarta.annotation.Resource; import java.util.*; import java.util.stream.Collectors; @@ -351,12 +351,11 @@ public class TestPlanScenarioCaseService { map.put(s, envMap.get(s)); } } - String envJsonStr = JSON.toJSONString(map); - if (!StringUtils.equals(envJsonStr, testPlanApiScenario.getEnvironment())) { - testPlanApiScenario.setEnvironmentType(EnvironmentType.JSON.toString()); - testPlanApiScenario.setEnvironment(JSON.toJSONString(map)); - mapper.updateByPrimaryKeyWithBLOBs(testPlanApiScenario); - } + + testPlanApiScenario.setEnvironmentType(runModeConfig.getEnvironmentType()); + testPlanApiScenario.setEnvironmentGroupId(runModeConfig.getEnvironmentGroupId()); + testPlanApiScenario.setEnvironment(JSON.toJSONString(map)); + mapper.updateByPrimaryKeyWithBLOBs(testPlanApiScenario); } sqlSession.flushStatements(); if (sqlSession != null && sqlSessionFactory != null) { diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseTaskMapper.xml b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseTaskMapper.xml index 5f0d2071a2..265538de8f 100644 --- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseTaskMapper.xml +++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseTaskMapper.xml @@ -40,7 +40,7 @@ AND t.user_id = #{request.executor} AND (t.integrated_report_id IS NULL OR t.integrated_report_id = 'null') - ORDER BY t.create_time DESC + ORDER BY t.create_time,t.end_time DESC