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 540ee78564..0bc374ed8b 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 @@ -13,6 +13,7 @@ public class ApiScenarioDTO extends ApiScenarioWithBLOBs { private String projectName; private String userName; private List tagNames; + 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 4cc2eca211..48006e8b06 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,10 +149,11 @@ 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 + project.name as project_name, user.name as user_name ,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 u2 on api_scenario.principal = u2.id @@ -224,6 +225,12 @@ #{value} + + and api_scenario.user_id in + + #{value} + + and api_scenario.level in @@ -248,6 +255,12 @@ #{value} + + and api_scenario.principal in + + #{value} + + diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue index 75a22da74c..9863854244 100644 --- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue +++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue @@ -98,14 +98,14 @@ - -