From ae474fadd79544e225e317568c94a992c8bb9390 Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Fri, 16 Oct 2020 23:39:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9C=80=E8=BF=91=E7=9A=84=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E6=94=B9=E4=B8=BA=E6=88=91=E6=9C=80=E8=BF=91=E7=9A=84?=
 =?UTF-8?q?=E8=AF=84=E5=AE=A1=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtTestCaseReviewMapper.java     |  3 ++-
 .../base/mapper/ext/ExtTestCaseReviewMapper.xml | 17 ++++++++++++-----
 .../track/service/TestCaseReviewService.java    |  3 ++-
 frontend/src/i18n/en-US.js                      |  2 +-
 frontend/src/i18n/zh-CN.js                      |  2 +-
 frontend/src/i18n/zh-TW.js                      |  2 +-
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.java
index aab6849b78..791044b1bb 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.java
@@ -12,12 +12,13 @@ public interface ExtTestCaseReviewMapper {
 
     List<TestCaseReviewDTO> list(@Param("request") QueryCaseReviewRequest params);
 
-    List<TestCaseReviewDTO> listByWorkspaceId(@Param("workspaceId") String workspaceId);
+    List<TestCaseReviewDTO> listByWorkspaceId(@Param("workspaceId") String workspaceId, @Param("userId") String userId);
 
     List<TestReviewDTOWithMetric> listRelate(@Param("request") QueryTestReviewRequest request);
 
     /**
      * 检查某工作空间下是否有某测试评审
+     *
      * @param reviewId
      * @param workspaceId
      * @return Review ID
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml
index d0eac18a7f..4c1976ad86 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml
@@ -27,11 +27,18 @@
     <select id="listByWorkspaceId" resultType="io.metersphere.track.dto.TestCaseReviewDTO"
             parameterType="io.metersphere.track.request.testreview.QueryCaseReviewRequest">
         select distinct test_case_review.*
-          from test_case_review, project, test_case_review_project
-         where test_case_review.id = test_case_review_project.review_id
-           and test_case_review_project.project_id = project.id
-           and project.workspace_id = #{workspaceId}
-           order by test_case_review.update_time desc
+        from test_case_review, project, test_case_review_project, test_case_review_users
+        <where>
+            test_case_review.id = test_case_review_project.review_id
+            and test_case_review_project.project_id = project.id
+            and project.workspace_id = #{workspaceId}
+            and (
+            (test_case_review_users.review_id = test_case_review.id
+            and test_case_review_users.user_id = #{userId} )
+            or test_case_review.creator = #{userId}
+            )
+        </where>
+        order by test_case_review.update_time desc
     </select>
 
     <select id="listRelate" resultType="io.metersphere.track.dto.TestReviewDTOWithMetric">
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
index cd21c49a64..809fd0bb06 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
@@ -36,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -150,7 +151,7 @@ public class TestCaseReviewService {
     }
 
     public List<TestCaseReviewDTO> recent(String currentWorkspaceId) {
-        return extTestCaseReviewMapper.listByWorkspaceId(currentWorkspaceId);
+        return extTestCaseReviewMapper.listByWorkspaceId(currentWorkspaceId, SessionUtils.getUserId());
     }
 
     public void editCaseReview(SaveTestCaseReviewRequest testCaseReview) {
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index a8c17c0b13..91864a33b5 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -654,7 +654,7 @@ export default {
     length_less_than: "The length less than",
     recent_plan: "My recent plan",
     recent_case: "My recent case",
-    recent_review: "Recent review",
+    recent_review: "My recent review",
     pass_rate: "Pass rate",
     execution_result: ": Please select the execution result",
     actual_result: ": The actual result is empty",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 5d955b9f7c..eaa56844a4 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -656,7 +656,7 @@ export default {
     length_less_than: "长度必须小于",
     recent_plan: "我最近的计划",
     recent_case: "我最近的用例",
-    recent_review: "最近的评审",
+    recent_review: "我最近的评审",
     pass_rate: "通过率",
     execution_result: ": 请选择执行结果",
     actual_result: ": 实际结果为空",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 30e9e04a09..2caf9cbc21 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -656,7 +656,7 @@ export default {
     length_less_than: "長度必須小於",
     recent_plan: "我最近的計劃",
     recent_case: "我最近的用例",
-    recent_review: "最近的評審",
+    recent_review: "我最近的評審",
     pass_rate: "通過率",
     execution_result: ": 請選擇執行結果",
     actual_result: ": 實際結果為空",