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

fix(接口测试): 修复接口自动化场景列表创建人显示为id的缺陷 (#10559) 

--bug=1010275 --user=王孝刚 [接口自动化] github#10496v1.17.2
接口测试-接口自动化-场景列表：创建人显示为id https://www.tapd.cn/55049933/s/1104284

Co-authored-by: wxg0103 <727495428@qq.com>
This commit is contained in:
metersphere-bot 2022-02-16 11:48:39 +08:00 committed by GitHub
parent c309a2394f
commit 9526c87eaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
View File

@ -162,14 +162,16 @@
api_scenario.status, api_scenario.principal, api_scenario.step_total, api_scenario.status, api_scenario.principal, api_scenario.step_total,
api_scenario.last_result,api_scenario.pass_rate,api_scenario.report_id, api_scenario.last_result,api_scenario.pass_rate,api_scenario.report_id,
api_scenario.schedule, api_scenario.description, api_scenario.create_time, api_scenario.update_time, api_scenario.schedule, api_scenario.description, api_scenario.create_time, api_scenario.update_time,
project.name as project_name, user.name as user_name,deleteUser.name AS delete_user,api_scenario.delete_time ,u2.name as principal_name, project.name as project_name, user.name as user_name,deleteUser.name AS delete_user,api_scenario.delete_time
api_scenario.create_user as creator ,u2.name as principal_name,
api_scenario.create_user as creator , user.name as creator_name
from api_scenario from api_scenario
left join project on api_scenario.project_id = project.id left join project on api_scenario.project_id = project.id
left join user on api_scenario.user_id = user.id left join user on api_scenario.user_id = user.id and api_scenario.create_user = user.id
left join user deleteUser on api_scenario.delete_user_id = deleteUser.id left join user deleteUser on api_scenario.delete_user_id = deleteUser.id
left join user u2 on api_scenario.principal = u2.id left join user u2 on api_scenario.principal = u2.id
left join project_version on api_scenario.project_id = project_version.project_id AND project_version.id = api_scenario.version_id left join project_version on api_scenario.project_id = project_version.project_id AND project_version.id =
api_scenario.version_id
<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>

2
frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
View File

@ -139,7 +139,7 @@
:field="item" :field="item"
:fields-width="fieldsWidth" :fields-width="fieldsWidth"
sortable/> sortable/>
<ms-table-column prop="creator" min-width="120px" <ms-table-column prop="creatorName" min-width="120px"
:label="$t('api_test.automation.creator')" :label="$t('api_test.automation.creator')"
:filters="userFilters" :filters="userFilters"
:field="item" :field="item"

2
frontend/src/common/js/default-table-header.js
View File

@ -73,7 +73,7 @@ export let CUSTOM_TABLE_HEADER = {
{id: 'status', key: '4', label: 'test_track.plan.plan_status'}, {id: 'status', key: '4', label: 'test_track.plan.plan_status'},
{id: 'tags', key: '5', label: 'commons.tag'}, {id: 'tags', key: '5', label: 'commons.tag'},
{id: 'versionId', key: 'f', label: 'project.version.name', xpack: true}, {id: 'versionId', key: 'f', label: 'project.version.name', xpack: true},
{id: 'creator', key: 'd', label: 'api_test.automation.creator'}, {id: 'creatorName', key: 'd', label: 'api_test.automation.creator'},
{id: 'principalName', key: '6', label: 'api_test.definition.api_principal'}, {id: 'principalName', key: '6', label: 'api_test.definition.api_principal'},
{id: 'environmentMap', key: 'e', label: 'commons.environment'}, {id: 'environmentMap', key: 'e', label: 'commons.environment'},
{id: 'updateTime', key: '7', label: 'api_test.definition.api_last_time'}, {id: 'updateTime', key: '7', label: 'api_test.definition.api_last_time'},