From 81a1186c8cd29e03d18e2c5508a3e5b2b98b0157 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Mon, 12 Jul 2021 15:25:39 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E5=9C=BA=E6=99=AF=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=88=97=E8=A1=A8=20=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=BA=BA=EF=BC=8C=E8=B4=9F=E8=B4=A3=E4=BA=BA=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=20=E5=92=8C=20=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98=20#1004989?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metersphere/api/dto/automation/ApiScenarioDTO.java | 1 + .../metersphere/base/mapper/ext/ExtApiScenarioMapper.xml | 9 +++++---- .../api/automation/scenario/ApiScenarioList.vue | 4 ++-- frontend/src/common/js/default-table-header.js | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioDTO.java b/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioDTO.java index a1b18aa776..762e739e97 100644 --- a/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioDTO.java +++ b/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioDTO.java @@ -15,6 +15,7 @@ public class ApiScenarioDTO extends ApiScenarioWithBLOBs { private List tagNames; private String deleteUser; private Long deleteTime; + private String principalName; /** * 场景跨项目ID 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 4fca437753..c228ad1f0a 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 @@ -149,11 +149,12 @@ api_scenario.status, api_scenario.principal, api_scenario.step_total, api_scenario.follow_people, 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 + project.name as project_name, user.name as user_name,deleteUser.name AS delete_user,api_scenario.delete_time ,u2.name as principal_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 deleteUser on api_scenario.delete_user_id = deleteUser.id + left join user u2 on api_scenario.principal = u2.id @@ -321,10 +322,10 @@ - + update api_scenario set original_state=status, - status = 'Trash', module_path = null, api_scenario_module_id = null,delete_user_id = #{operator},delete_time = #{operationTime} + status = 'Trash', module_path = null, api_scenario_module_id = null @@ -333,7 +334,7 @@ update api_scenario set - status = original_state,delete_user_id = null,delete_time = null + status = original_state where id in #{v} diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue index acc5b1a712..ef1c457dfc 100644 --- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue +++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue @@ -116,14 +116,14 @@ - -