From 9526c87eaf118fc0a16c7320a8229f54ae245820 Mon Sep 17 00:00:00 2001
From: metersphere-bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Wed, 16 Feb 2022 11:48:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8=E5=8C=96?=
=?UTF-8?q?=E5=9C=BA=E6=99=AF=E5=88=97=E8=A1=A8=E5=88=9B=E5=BB=BA=E4=BA=BA?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BAid=E7=9A=84=E7=BC=BA=E9=99=B7=20(#10?=
=?UTF-8?q?559)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
--bug=1010275 --user=王孝刚 [接口自动化] github#10496v1.17.2
接口测试-接口自动化-场景列表：创建人显示为id https://www.tapd.cn/55049933/s/1104284
Co-authored-by: wxg0103 <727495428@qq.com>
---
.../base/mapper/ext/ExtApiScenarioMapper.xml | 10 ++++++----
.../api/automation/scenario/ApiScenarioList.vue | 2 +-
frontend/src/common/js/default-table-header.js | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
index 022f3033aa..1d47544e53 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
@@ -162,14 +162,16 @@
api_scenario.status, api_scenario.principal, api_scenario.step_total,
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,
- project.name as project_name, user.name as user_name,deleteUser.name AS delete_user,api_scenario.delete_time ,u2.name as principal_name,
- api_scenario.create_user as creator
+ project.name as project_name, user.name as user_name,deleteUser.name AS delete_user,api_scenario.delete_time
+ ,u2.name as principal_name,
+ api_scenario.create_user as creator , user.name as creator_name
from api_scenario
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 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
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index 992356400b..ea7e454e20 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -139,7 +139,7 @@
:field="item"
:fields-width="fieldsWidth"
sortable/>
-