From 52391e7dd4bea36284d8f4a28fdfde7a31c17395 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Wed, 27 Oct 2021 19:56:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.接口用例筛选失效
2.饼图显示数据
3.接口用例在接口定义后面
4.点击全部项目暂时让他不生效
5.接口用例点击更新和完成数据有问题
6.计划没有用例的显示
7.接口定义创建人是userId
8.饼图加线
9.性能用例去掉项目ID的过滤
---
 .../io/metersphere/api/parse/ApiImportAbstractParser.java     | 2 ++
 .../java/io/metersphere/api/service/ApiDefinitionService.java | 4 ----
 .../java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml | 4 ++--
 .../io/metersphere/track/service/TestCaseReviewService.java   | 4 ++--
 .../components/common/components/MsBorderPieChart.vue         | 4 ++--
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java b/backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java
index 50a9d6418d..dadbe5f9c0 100644
--- a/backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java
+++ b/backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java
@@ -127,8 +127,10 @@ public abstract class ApiImportAbstractParser<T> implements ApiImportParser<T> {
         apiDefinition.setProjectId(this.projectId);
         if (StringUtils.equalsIgnoreCase("schedule", importRequest.getType())) {
             apiDefinition.setUserId(importRequest.getUserId());
+            apiDefinition.setCreateUser(importRequest.getUserId());
         } else {
             apiDefinition.setUserId(SessionUtils.getUserId());
+            apiDefinition.setCreateUser(SessionUtils.getUserId());
         }
         return apiDefinition;
     }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index b0c36c399a..100dbcc0f4 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -238,10 +238,6 @@ public class ApiDefinitionService {
                 }
             }
         }
-        //update userId
-        if(StringUtils.equalsIgnoreCase(request.getUserId(),"currentUserId")){
-            request.setUserId(SessionUtils.getUserId());
-        }
         return request;
     }
 
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
index 2c567160ec..1b16544f68 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
@@ -120,8 +120,8 @@
         LEFT JOIN schedule ON schedule.resource_id = test_plan.id
         JOIN project on project.id = test_plan.project_id
         <if test="request.executorOrPrincipal != null">
-            JOIN test_plan_principal ON test_plan_principal.test_plan_id = test_plan.id
-            JOIN test_plan_test_case on test_plan_test_case.plan_id = test_plan.id
+            LEFT JOIN test_plan_principal ON test_plan_principal.test_plan_id = test_plan.id
+            LEFT JOIN test_plan_test_case on test_plan_test_case.plan_id = test_plan.id
         </if>
         <where>
             <if test="request.combine != null">
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 ae1bac49e2..aed5db6c78 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
@@ -153,10 +153,10 @@ public class TestCaseReviewService {
 
     public List<TestCaseReviewDTO> listCaseReview(QueryCaseReviewRequest request) {
         request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
-        String projectId = request.getProjectId();
+        /*String projectId = request.getProjectId();
         if (StringUtils.isBlank(projectId)) {
             return new ArrayList<>();
-        }
+        }*/
         //update   reviewerId
         if(StringUtils.equalsIgnoreCase(request.getReviewerId(),"currentUserId")){
             request.setReviewerId(SessionUtils.getUserId());
diff --git a/frontend/src/business/components/common/components/MsBorderPieChart.vue b/frontend/src/business/components/common/components/MsBorderPieChart.vue
index 8afaa5242e..410981d26f 100644
--- a/frontend/src/business/components/common/components/MsBorderPieChart.vue
+++ b/frontend/src/business/components/common/components/MsBorderPieChart.vue
@@ -38,8 +38,8 @@ export default {
             },
             label: {
               show: true,
-              position:'inner',
-              formatter: '{d}%',
+              position:'outside',
+              formatter: '{c}, {d}%',
             },
             labelLine: {
               show: true