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

fix(测试跟踪、接口定义): 测试跟踪、接口定义列表报错

This commit is contained in:
wxg0103 2022-01-21 19:34:48 +08:00 committed by fit2-zhao
parent ce0f4cbf25
commit ec82ffab5d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
View File

@ -246,7 +246,7 @@
api_definition.name,api_definition.protocol,api_definition.path,api_definition.module_id,api_definition.module_path,api_definition.method, api_definition.name,api_definition.protocol,api_definition.path,api_definition.module_id,api_definition.module_path,api_definition.method,
api_definition.description,api_definition.request,api_definition.response,api_definition.environment_id, api_definition.description,api_definition.request,api_definition.response,api_definition.environment_id,
api_definition.status, api_definition.user_id, api_definition.create_time, api_definition.update_time, api_definition.delete_user_id, api_definition.create_user,api_definition.delete_time, api_definition.remark, api_definition.version_id, api_definition.status, api_definition.user_id, api_definition.create_time, api_definition.update_time, api_definition.delete_user_id, api_definition.create_user,api_definition.delete_time, api_definition.remark, api_definition.version_id,
project_version.name as version_name, api_definition.ref_id, user.name as user_name, project_version.name as version_name, api_definition.ref_id, user.name as user_name
from api_definition from api_definition
left join user on api_definition.user_id = user.id left join user on api_definition.user_id = user.id
LEFT JOIN project_version ON project_version.id = api_definition.version_id AND project_version.project_id = #{request.projectId} LEFT JOIN project_version ON project_version.id = api_definition.version_id AND project_version.project_id = #{request.projectId}

4
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
View File

@ -212,7 +212,7 @@
<select id="list" resultType="io.metersphere.track.dto.TestCaseDTO"> <select id="list" resultType="io.metersphere.track.dto.TestCaseDTO">
select select
deleteUser.name AS delete_user_id,test_case.delete_time, test_case.delete_user_id ,test_case.delete_time,
project_version.name as versionName, project_version.name as versionName,
project_version.id as versionId, project_version.id as versionId,
<if test="request.selectFields != null and request.selectFields.size() > 0"> <if test="request.selectFields != null and request.selectFields.size() > 0">
@ -230,7 +230,7 @@
test_case.custom_fields, test_case.ref_id test_case.custom_fields, test_case.ref_id
</if> </if>
from test_case from test_case
left join project_version on project_version.id = test_case.version_id and project_version.project_id = #{request.project_id} left join project_version on project_version.id = test_case.version_id and project_version.project_id = #{request.projectId}
<include refid="queryWhereCondition"/> <include refid="queryWhereCondition"/>
<include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/> <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
</select> </select>