From 0ee2cd7b61c34ddef1c9ccab7430708d95351229 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 22 Nov 2021 14:35:13 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=88=91=E7=9A=84=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E7=9B=98):=20=E4=BF=AE=E6=94=B9=E6=88=91=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E7=9A=84=E7=94=A8=E4=BE=8B=E7=9A=84=E6=9F=A5=E8=AF=A2sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦 我的工作台——我的仪表盘-我创建的用例-查询条件修改
---
 .../io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml    | 2 +-
 .../io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml    | 3 +++
 .../java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
index 33f5551865..5eeff7a667 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
@@ -113,7 +113,7 @@
             </include>
         </if>
         <if test="${condition}.creator != null">
-            and api_scenario.user_id
+            and api_scenario.create_user
             <include refid="condition">
                 <property name="object" value="${condition}.creator"/>
             </include>
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index 50795c655c..ccf20585a3 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -691,6 +691,9 @@
             <if test="request.workspaceId != null">
                 AND project.workspace_id = #{request.workspaceId}
             </if>
+            <if test="request.filters == null || request.filters.size() == 0 ">
+                and (api_test_case.status is null or api_test_case.status != 'Trash')
+            </if>
         </where>
     </sql>
 
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
index fe38378844..005ecebba1 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
@@ -92,7 +92,7 @@
             </include>
         </if>
         <if test="${condition}.creator != null">
-            AND load_test.user_id
+            AND load_test.create_user
             <include refid="condition">
                 <property name="object" value="${condition}.creator"/>
             </include>