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

fix(接口测试): 修复场景执行在某些情况下转Hashtree失败的问题 

--bug=1023565 --user=宋天阳 【接口测试】附件中的场景执行报错
https://www.tapd.cn/55049933/s/1340115
This commit is contained in:
song-tianyang 2023-02-21 19:39:18 +08:00 committed by 建国
parent 8669e0ec97
commit dc66661a8f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
View File

@ -277,7 +277,7 @@ public class MsScenario extends MsTestElement {
String environmentGroupId = scenario.getEnvironmentGroupId(); String environmentGroupId = scenario.getEnvironmentGroupId();
if (StringUtils.equals(environmentType, EnvironmentType.GROUP.name())) { if (StringUtils.equals(environmentType, EnvironmentType.GROUP.name())) {
this.environmentMap = environmentGroupProjectService.getEnvMap(environmentGroupId); this.environmentMap = environmentGroupProjectService.getEnvMap(environmentGroupId);
} else if (StringUtils.equals(environmentType, EnvironmentType.JSON.name())) { } else if (StringUtils.isNotEmpty(environmentJson) && StringUtils.equals(environmentType, EnvironmentType.JSON.name())) {
this.environmentMap = JSON.parseObject(environmentJson, Map.class); this.environmentMap = JSON.parseObject(environmentJson, Map.class);
} }
} else { } else {

4
framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseTaskMapper.xml
View File

@ -40,7 +40,7 @@
AND t.user_id = #{request.executor} AND t.user_id = #{request.executor}
</if> </if>
AND (t.integrated_report_id IS NULL OR t.integrated_report_id = 'null') AND (t.integrated_report_id IS NULL OR t.integrated_report_id = 'null')
ORDER BY t.create_time,t.end_time DESC ORDER BY t.create_time DESC
</select> </select>
<select id="getScenarioTasks" resultType="io.metersphere.task.dto.TaskCenterDTO" parameterType="java.lang.String"> <select id="getScenarioTasks" resultType="io.metersphere.task.dto.TaskCenterDTO" parameterType="java.lang.String">
@ -70,7 +70,7 @@
<if test="request.executor != null and request.executor != ''"> <if test="request.executor != null and request.executor != ''">
AND t.user_id = #{request.executor} AND t.user_id = #{request.executor}
</if> </if>
ORDER BY t.create_time,t.end_time DESC ORDER BY t.create_time DESC
</select> </select>
<select id="getPerfTasks" resultType="io.metersphere.task.dto.TaskCenterDTO" parameterType="java.lang.String"> <select id="getPerfTasks" resultType="io.metersphere.task.dto.TaskCenterDTO" parameterType="java.lang.String">