From d370a5bb7bd69398b9dc6dbdd0991c67ecd1c30a Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 22 Sep 2020 18:37:18 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1):=20?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1=E6=97=B6?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtTestCaseReviewMapper.xml    |  5 +-
 .../track/service/TestCaseReviewService.java  | 51 ++++++++++---------
 2 files changed, 29 insertions(+), 27 deletions(-)

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 0dfdc87839..30b739c64d 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
@@ -4,14 +4,13 @@
 
     <select id="list" resultType="io.metersphere.track.dto.TestCaseReviewDTO"
             parameterType="io.metersphere.track.request.testreview.QueryCaseReviewRequest">
-        select distinct test_case_review.id, test_case_review.name, user.name as creator, test_case_review.status,
+        select distinct test_case_review.id, test_case_review.name, test_case_review.creator, test_case_review.status,
         test_case_review.create_time, test_case_review.update_time, test_case_review.end_time,
         test_case_review.description
-        from test_case_review, project, test_case_review_project, user
+        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 user.id = test_case_review.creator
             <if test="request.name != null">
                 and test_case_review.name like CONCAT('%', #{request.name},'%')
             </if>
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 c1f68660de..a44843a503 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
@@ -351,33 +351,36 @@ public class TestCaseReviewService {
             }
         });
 
-        testReviews.forEach(testReview -> {
-            List<TestReviewCaseDTO> testCases = testCaseMap.get(testReview.getId());
+        if (!CollectionUtils.isEmpty(testReviews)) {
+            testReviews.forEach(testReview -> {
+                List<TestReviewCaseDTO> testCases = testCaseMap.get(testReview.getId());
 
-            TestCaseReviewUsersExample testCaseReviewUsersExample = new TestCaseReviewUsersExample();
-            testCaseReviewUsersExample.createCriteria().andReviewIdEqualTo(testReview.getId());
-            List<String> userIds = testCaseReviewUsersMapper.selectByExample(testCaseReviewUsersExample)
-                    .stream().map(TestCaseReviewUsers::getUserId).collect(Collectors.toList());
-            String reviewName = getReviewName(userIds);
-            testReview.setReviewerName(reviewName);
+                TestCaseReviewUsersExample testCaseReviewUsersExample = new TestCaseReviewUsersExample();
+                testCaseReviewUsersExample.createCriteria().andReviewIdEqualTo(testReview.getId());
+                List<String> userIds = testCaseReviewUsersMapper.selectByExample(testCaseReviewUsersExample)
+                        .stream().map(TestCaseReviewUsers::getUserId).collect(Collectors.toList());
+                String reviewName = getReviewName(userIds);
+                testReview.setReviewerName(reviewName);
 
-            User u = userMapper.selectByPrimaryKey(testReview.getCreator());
-            testReview.setCreator(u.getName());
-
-            testReview.setReviewed(0);
-            testReview.setTotal(0);
-            if (testCases != null) {
-                testReview.setTotal(testCases.size());
-                testCases.forEach(testCase -> {
-                    if (!StringUtils.equals(testCase.getStatus(), TestPlanTestCaseStatus.Prepare.name())
-                            && !StringUtils.equals(testCase.getStatus(), TestPlanTestCaseStatus.Underway.name())) {
-                        testReview.setReviewed(testReview.getReviewed() + 1);
-                    }
-                });
-            }
-            testReview.setTestRate(MathUtils.getPercentWithDecimal(testReview.getTotal() == 0 ? 0 : testReview.getReviewed() * 1.0 / testReview.getTotal()));
-        });
+                User u = userMapper.selectByPrimaryKey(testReview.getCreator());
+                if (u != null) {
+                    testReview.setCreator(u.getName());
+                }
 
+                testReview.setReviewed(0);
+                testReview.setTotal(0);
+                if (testCases != null) {
+                    testReview.setTotal(testCases.size());
+                    testCases.forEach(testCase -> {
+                        if (!StringUtils.equals(testCase.getStatus(), TestPlanTestCaseStatus.Prepare.name())
+                                && !StringUtils.equals(testCase.getStatus(), TestPlanTestCaseStatus.Underway.name())) {
+                            testReview.setReviewed(testReview.getReviewed() + 1);
+                        }
+                    });
+                }
+                testReview.setTestRate(MathUtils.getPercentWithDecimal(testReview.getTotal() == 0 ? 0 : testReview.getReviewed() * 1.0 / testReview.getTotal()));
+            });
+        }
         return testReviews;
     }