From 9264762f72d0d71c01367076d7664b73f92e151b Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 22 Mar 2023 10:51:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1=EF=BC=8C=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0=E6=9C=89?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1024731 --user=陈建星 【测试跟踪】用例评审-多人评审-全部通过-用例状态仍为评审中 https://www.tapd.cn/55049933/s/1354161
---
 .../service/TestCaseReviewTestCaseUsersService.java         | 6 ++++--
 .../io/metersphere/service/TestReviewTestCaseService.java   | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/test-track/backend/src/main/java/io/metersphere/service/TestCaseReviewTestCaseUsersService.java b/test-track/backend/src/main/java/io/metersphere/service/TestCaseReviewTestCaseUsersService.java
index 25d98edbc5..6eb6c1a20a 100644
--- a/test-track/backend/src/main/java/io/metersphere/service/TestCaseReviewTestCaseUsersService.java
+++ b/test-track/backend/src/main/java/io/metersphere/service/TestCaseReviewTestCaseUsersService.java
@@ -17,9 +17,11 @@ public class TestCaseReviewTestCaseUsersService {
     @Resource
     TestCaseReviewTestCaseUsersMapper testCaseReviewTestCaseUsersMapper;
 
-    public List<String> getUsersByCaseId(String caseId) {
+    public List<String> getUsersByCaseId(String caseId, String reviewId) {
         TestCaseReviewTestCaseUsersExample example = new TestCaseReviewTestCaseUsersExample();
-        example.createCriteria().andCaseIdEqualTo(caseId);
+        example.createCriteria()
+                .andCaseIdEqualTo(caseId)
+                .andReviewIdEqualTo(reviewId);
         return testCaseReviewTestCaseUsersMapper.selectByExample(example)
                 .stream()
                 .map(TestCaseReviewTestCaseUsers::getUserId)
diff --git a/test-track/backend/src/main/java/io/metersphere/service/TestReviewTestCaseService.java b/test-track/backend/src/main/java/io/metersphere/service/TestReviewTestCaseService.java
index ea509eca7e..67cf50b4a4 100644
--- a/test-track/backend/src/main/java/io/metersphere/service/TestReviewTestCaseService.java
+++ b/test-track/backend/src/main/java/io/metersphere/service/TestReviewTestCaseService.java
@@ -251,7 +251,7 @@ public class TestReviewTestCaseService {
         String reviewPassRule = testCaseReviewService.getTestReview(testCaseReviewTestCase.getReviewId())
                 .getReviewPassRule();
 
-        List<String> users = testCaseReviewTestCaseUsersService.getUsersByCaseId(testCaseReviewTestCase.getCaseId());
+        List<String> users = testCaseReviewTestCaseUsersService.getUsersByCaseId(testCaseReviewTestCase.getCaseId(), testCaseReviewTestCase.getReviewId());
         Set<String> reviewerSet = users.stream().collect(Collectors.toSet());
 
         comments = filterAgainComments(comments);
@@ -292,7 +292,7 @@ public class TestReviewTestCaseService {
         String originStatus = originReviewTestCase.getStatus();
         String status = originStatus;
 
-        List<String> reviewers = testCaseReviewTestCaseUsersService.getUsersByCaseId(testCaseReviewTestCase.getCaseId());
+        List<String> reviewers = testCaseReviewTestCaseUsersService.getUsersByCaseId(testCaseReviewTestCase.getCaseId(), testCaseReviewTestCase.getReviewId());
 
         Set<String> reviewerSet = reviewers.stream().collect(Collectors.toSet());