From eb460e8545ae27491b673176cbece1939c8ab60f Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
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

---
 .../api/dto/automation/ApiScenarioDTO.java        |  1 +
 .../base/mapper/ext/ExtApiScenarioMapper.xml      | 15 ++++++++++++++-
 .../api/automation/scenario/ApiScenarioList.vue   |  4 ++--
 frontend/src/common/js/default-table-header.js    |  4 ++--
 4 files changed, 19 insertions(+), 5 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 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<String> 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
         <include refid="queryWhereCondition"/>
         <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
     </select>
@@ -224,6 +225,12 @@
                                     #{value}
                                 </foreach>
                             </when>
+                            <when test="key=='user_name'">
+                                and api_scenario.user_id in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
                             <when test="key=='level'">
                                 and api_scenario.level in
                                 <foreach collection="values" item="value" separator="," open="(" close=")">
@@ -248,6 +255,12 @@
                                     #{value}
                                 </foreach>
                             </when>
+                            <when test="key=='principal_name'">
+                                and api_scenario.principal in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
 
                         </choose>
                     </if>
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 @@
             </template>
           </ms-table-column>
 
-          <ms-table-column  prop="principal"
+          <ms-table-column  prop="principalName"
                             min-width="120px"
                             :label="$t('api_test.definition.api_principal')"
                             :filters="userFilters"
                             :field="item"
                             :fields-width="fieldsWidth"
                             sortable/>
-          <ms-table-column prop="userId" min-width="120px"
+          <ms-table-column prop="userName" min-width="120px"
                            :label="$t('api_test.automation.creator')"
                            :filters="userFilters"
                            :field="item"
diff --git a/frontend/src/common/js/default-table-header.js b/frontend/src/common/js/default-table-header.js
index 31839a2bf7..a0f0347d82 100644
--- a/frontend/src/common/js/default-table-header.js
+++ b/frontend/src/common/js/default-table-header.js
@@ -66,8 +66,8 @@ export const CUSTOM_TABLE_HEADER = {
     {id: 'level', key: '3', label: i18n.t('api_test.automation.case_level')},
     {id: 'status', key: '4', label: i18n.t('test_track.plan.plan_status')},
     {id: 'tags', key: '5', label: i18n.t('commons.tag')},
-    {id: 'userId', key: '6', label: i18n.t('api_test.automation.creator')},
-    {id: 'principal', key: '7', label: i18n.t('api_test.definition.api_principal')},
+    {id: 'userName', key: '6', label: i18n.t('api_test.automation.creator')},
+    {id: 'principalName', key: '7', label: i18n.t('api_test.definition.api_principal')},
     {id: 'updateTime', key: '8', label: i18n.t('api_test.definition.api_last_time')},
     {id: 'stepTotal', key: '9', label: i18n.t('api_test.automation.step')},
     {id: 'lastResult', key: 'a', label: i18n.t('api_test.automation.last_result')},