From ec82ffab5db6a4323d6262429852f5041dfcc300 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 21 Jan 2022 19:34:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA?=
 =?UTF-8?q?=E3=80=81=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):=20=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=B7=9F=E8=B8=AA=E3=80=81=E6=8E=A5=E5=8F=A3=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=88=97=E8=A1=A8=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml | 2 +-
 .../java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
index 059d0cad73..019c8d5555 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
@@ -246,7 +246,7 @@
         api_definition.name,api_definition.protocol,api_definition.path,api_definition.module_id,api_definition.module_path,api_definition.method,
         api_definition.description,api_definition.request,api_definition.response,api_definition.environment_id,
         api_definition.status, api_definition.user_id, api_definition.create_time, api_definition.update_time, api_definition.delete_user_id, api_definition.create_user,api_definition.delete_time, api_definition.remark, api_definition.version_id,
-        project_version.name as version_name, api_definition.ref_id, user.name as user_name,
+        project_version.name as version_name, api_definition.ref_id, user.name as user_name
         from api_definition
         left join user on api_definition.user_id = user.id
         LEFT JOIN project_version ON project_version.id = api_definition.version_id AND project_version.project_id = #{request.projectId}
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 78355cb18f..8026c7a158 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
@@ -212,7 +212,7 @@
 
     <select id="list" resultType="io.metersphere.track.dto.TestCaseDTO">
         select
-        deleteUser.name AS delete_user_id,test_case.delete_time,
+        test_case.delete_user_id ,test_case.delete_time,
         project_version.name as versionName,
         project_version.id as versionId,
         <if test="request.selectFields != null and request.selectFields.size() > 0">
@@ -230,7 +230,7 @@
             test_case.custom_fields, test_case.ref_id
         </if>
         from test_case
-        left join project_version on project_version.id = test_case.version_id and project_version.project_id = #{request.project_id}
+        left join project_version on project_version.id = test_case.version_id and project_version.project_id = #{request.projectId}
         <include refid="queryWhereCondition"/>
         <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
     </select>