From f014d5267ded2319c2f5560727f81e428d6aad10 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Sat, 9 May 2020 18:07:23 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml  | 3 +++
 .../controller/request/testcase/QueryTestCaseRequest.java      | 1 -
 .../business/components/track/case/components/TestCaseEdit.vue | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index 38d88c367..0d4b45e0b 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -57,6 +57,9 @@
                     #{nodeId}
                 </foreach>
             </if>
+            <if test="request.projectId != null">
+                and test_case.project_id = #{request.projectId}
+            </if>
             <if test="request.filters != null and request.filters.size() > 0">
                 <foreach collection="request.filters.entrySet()" index="key" item="values">
                     <if test="values != null and values.size() > 0">
diff --git a/backend/src/main/java/io/metersphere/controller/request/testcase/QueryTestCaseRequest.java b/backend/src/main/java/io/metersphere/controller/request/testcase/QueryTestCaseRequest.java
index daa1bc914..12a9124cd 100644
--- a/backend/src/main/java/io/metersphere/controller/request/testcase/QueryTestCaseRequest.java
+++ b/backend/src/main/java/io/metersphere/controller/request/testcase/QueryTestCaseRequest.java
@@ -1,7 +1,6 @@
 package io.metersphere.controller.request.testcase;
 
 import io.metersphere.base.domain.TestCase;
-import io.metersphere.controller.request.FilterRequest;
 import io.metersphere.controller.request.OrderRequest;
 import lombok.Data;
 
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 4e554b80f..dc6296d7d 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -43,7 +43,7 @@
                 <el-option
                   v-for="item in maintainerOptions"
                   :key="item.id"
-                  :label="item.id"
+                  :label="item.name"
                   :value="item.id">
                 </el-option>
               </el-select>
-- 
GitLab