From 94d85803eca6817c6964c4f8337fb2eaff366752 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 9 Jun 2021 12:58:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E6=89=A7=E8=A1=8C=E4=BA=BA=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/metersphere/track/dto/TestPlanCaseDTO.java  | 1 +
 .../track/request/testplancase/QueryTestPlanCaseRequest.java | 2 ++
 .../metersphere/track/service/TestPlanTestCaseService.java   | 5 +++--
 .../view/comonents/functional/FunctionalTestCaseList.vue     | 5 +++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/dto/TestPlanCaseDTO.java b/backend/src/main/java/io/metersphere/track/dto/TestPlanCaseDTO.java
index 79a0ef748a..b925babbcf 100644
--- a/backend/src/main/java/io/metersphere/track/dto/TestPlanCaseDTO.java
+++ b/backend/src/main/java/io/metersphere/track/dto/TestPlanCaseDTO.java
@@ -21,6 +21,7 @@ public class TestPlanCaseDTO extends TestCaseWithBLOBs {
     private String model;
     private String projectName;
     private String actualResult;
+    private String maintainerName;
 
     private List<TestCaseTestDTO> list;
 }
diff --git a/backend/src/main/java/io/metersphere/track/request/testplancase/QueryTestPlanCaseRequest.java b/backend/src/main/java/io/metersphere/track/request/testplancase/QueryTestPlanCaseRequest.java
index 817d9e7cca..1c6d2cb82b 100644
--- a/backend/src/main/java/io/metersphere/track/request/testplancase/QueryTestPlanCaseRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testplancase/QueryTestPlanCaseRequest.java
@@ -26,6 +26,8 @@ public class QueryTestPlanCaseRequest extends TestPlanTestCase {
 
     private String workspaceId;
 
+    private String projectId;
+
     private String name;
 
     private String status;
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
index 7297faea00..d23c043630 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
@@ -62,11 +62,12 @@ public class TestPlanTestCaseService {
         request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
         List<TestPlanCaseDTO> list = extTestPlanTestCaseMapper.list(request);
         QueryMemberRequest queryMemberRequest = new QueryMemberRequest();
-        queryMemberRequest.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
-        Map<String, String> userMap = userService.getMemberList(queryMemberRequest)
+        queryMemberRequest.setProjectId(request.getProjectId());
+        Map<String, String> userMap = userService.getProjectMemberList(queryMemberRequest)
                 .stream().collect(Collectors.toMap(User::getId, User::getName));
         list.forEach(item -> {
             item.setExecutorName(userMap.get(item.getExecutor()));
+            item.setMaintainerName(userMap.get(item.getMaintainer()));
         });
         return list;
     }
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
index 6aa1259d0b..260abf9fe3 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
@@ -156,11 +156,11 @@
         <!-- 责任人(创建该用例时所关联的责任人) -->
         <el-table-column
           v-if="item.id == 'maintainer'"
-          prop="maintainer"
+          prop="maintainerName"
           :filters="maintainerFilters"
           min-width="100px"
           :key="index"
-          column-key="maintainer"
+          column-key="maintainerName"
           :label="$t('api_test.definition.request.responsible')">
         </el-table-column>
 
@@ -455,6 +455,7 @@ export default {
         // param.nodeIds = this.selectNodeIds;
         this.condition.nodeIds = this.selectNodeIds;
       }
+      this.condition.projectId = getCurrentProjectID();
       if (this.planId) {
         this.result = this.$post(this.buildPagePath('/test/plan/case/list'), this.condition, response => {
           let data = response.data;