From e277bba824f81c6213b97603a575f07379d07cf3 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 31 Oct 2022 18:25:37 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=88=91=E7=9A=84=E5=BE=85=E5=8A=9E=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=AE=A1=E5=88=92=E5=88=97=E8=A1=A8=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦
---
 .../base/mapper/ext/ExtTestPlanMapper.xml      | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
index bf2152a84c..10f474bf3c 100644
--- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
+++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
@@ -180,16 +180,10 @@
             <if test="request.id != null">
                 AND test_plan.id = #{request.id}
             </if>
-           <include refid="filter"/>
+            <include refid="filter"/>
             <if test="(request.filters == null or request.filters.size() == 0) and request.byFilter != true ">
                 and test_plan.status != 'Archived'
             </if>
-            <if test="request.byFilter == true">
-                and test_plan.status in
-                <foreach collection="request.filterStatus" item="value" separator="," open="(" close=")">
-                    #{value}
-                </foreach>
-            </if>
         </where>
 
         <if test="request.orders != null and request.orders.size() > 0">
@@ -211,15 +205,14 @@
                                     AND (( test_plan_principal.principal_id =
                                     '${@io.metersphere.commons.utils.SessionUtils@getUserId()}' and
                                     test_plan.status in
-                                        <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.filterInWrapper"/>
+                                    <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.filterInWrapper"/>
                                     )
                                     or
                                     (test_plan_test_case.executor =
                                     '${@io.metersphere.commons.utils.SessionUtils@getUserId()}' and
                                     test_plan_test_case.status in
-                                        <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.filterInWrapper"/>
+                                    <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.filterInWrapper"/>
                                     ))
-                                    AND test_plan.status != 'Archived'
                                 </when>
                                 <otherwise>
                                     and test_plan.status in
@@ -326,13 +319,12 @@
         SELECT p.name
         FROM test_plan tp
                  INNER JOIN project p ON p.id = tp.project_id
-        WHERE tp.id = #{0}
-        limit 1;
+        WHERE tp.id = #{0} limit 1;
     </select>
     <select id="findIdByPerformanceReportId" resultType="java.lang.String">
         SELECT report.id
         FROM test_plan_report report
-        INNER JOIN test_plan_report_content reportData ON report.id = reportData.test_plan_report_id
+                 INNER JOIN test_plan_report_content reportData ON report.id = reportData.test_plan_report_id
         WHERE reportData.plan_load_case_report_struct like CONCAT('%', #{0}, '%');
     </select>
     <select id="listRecent" resultType="io.metersphere.base.domain.TestPlan">