From c6972c465b9d488e8f8166adb6a7ab5fc738f6dd Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 24 Jun 2021 14:19:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E4=BE=8B=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA=E8=B4=A3=E4=BB=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excel/domain/TestCaseExcelDataCn.java     |  2 +-
 .../track/service/TestCaseService.java        | 19 ++++++++---------
 .../track/case/components/TestCaseList.vue    | 21 ++++++++++++-------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataCn.java b/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataCn.java
index a2063fc481..9934b40137 100644
--- a/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataCn.java
+++ b/backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataCn.java
@@ -35,7 +35,7 @@ public class TestCaseExcelDataCn extends TestCaseExcelData {
     private String nodePath;
 
     @NotBlank(message = "{cannot_be_null}")
-    @ExcelProperty("维护人")
+    @ExcelProperty(value = "责任人")
     private String maintainer;
 
     @NotBlank(message = "{cannot_be_null}")
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index 7d83b30683..aac69c7f63 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -16,6 +16,7 @@ import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.user.SessionUser;
 import io.metersphere.commons.utils.*;
 import io.metersphere.controller.request.OrderRequest;
+import io.metersphere.controller.request.member.QueryMemberRequest;
 import io.metersphere.excel.domain.ExcelErrData;
 import io.metersphere.excel.domain.ExcelResponse;
 import io.metersphere.excel.domain.TestCaseExcelData;
@@ -32,6 +33,7 @@ import io.metersphere.log.vo.OperatingLogDetails;
 import io.metersphere.log.vo.track.TestCaseReference;
 import io.metersphere.service.FileService;
 import io.metersphere.service.ProjectService;
+import io.metersphere.service.UserService;
 import io.metersphere.track.dto.TestCaseCommentDTO;
 import io.metersphere.track.dto.TestCaseDTO;
 import io.metersphere.track.request.testcase.EditTestCaseRequest;
@@ -74,7 +76,7 @@ public class TestCaseService {
     ExtTestCaseMapper extTestCaseMapper;
 
     @Resource
-    TestPlanMapper testPlanMapper;
+    UserService userService;
 
     @Resource
     TestPlanTestCaseMapper testPlanTestCaseMapper;
@@ -488,16 +490,13 @@ public class TestCaseService {
             }
 
         } else {
-            GroupExample groupExample = new GroupExample();
-            groupExample.createCriteria().andTypeIn(Arrays.asList(UserGroupType.WORKSPACE, UserGroupType.PROJECT));
-            List<Group> groups = groupMapper.selectByExample(groupExample);
-            List<String> groupIds = groups.stream().map(Group::getId).collect(Collectors.toList());
 
-            UserGroupExample userGroupExample = new UserGroupExample();
-            userGroupExample.createCriteria()
-                    .andGroupIdIn(groupIds)
-                    .andSourceIdEqualTo(currentWorkspaceId);
-            Set<String> userIds = userGroupMapper.selectByExample(userGroupExample).stream().map(UserGroup::getUserId).collect(Collectors.toSet());
+            QueryMemberRequest queryMemberRequest = new QueryMemberRequest();
+            queryMemberRequest.setProjectId(projectId);
+            Set<String> userIds = userService.getProjectMemberList(queryMemberRequest)
+                    .stream()
+                    .map(User::getId)
+                    .collect(Collectors.toSet());
 
             try {
                 //根据本地语言环境选择用哪种数据对象进行存放读取的数据
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 70fc62b094..7c504c2f21 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -57,13 +57,6 @@
           :label="$t('commons.create_user')"
           min-width="120"/>
 
-        <ms-table-column
-          prop="maintainer"
-          :field="item"
-          :fields-width="fieldsWidth"
-          :label="$t('custom_field.case_maintainer')"
-          min-width="120"/>
-
         <ms-table-column
           prop="reviewStatus"
           min-width="100px"
@@ -353,7 +346,19 @@ export default {
       });
     },
     getCustomFieldValue(row, field) {
-      return getCustomFieldValue(row, field, this.members);
+      let value = getCustomFieldValue(row, field, this.members);
+      if (!value) {
+        if (field.name === '用例等级') {
+          return row.priority;
+        }
+        if (field.name === '责任人') {
+          return row.maintainer;
+        }
+        if (field.name === '用例状态') {
+          return row.status;
+        }
+      }
+      return value;
     },
     checkRedirectEditPage(redirectParam) {
       if (redirectParam != null) {