From a5a64ba5a4810693f456f987e57986a67a784b01 Mon Sep 17 00:00:00 2001
From: WangXu10 <xu.wang@fit2cloud.com>
Date: Thu, 21 Nov 2024 13:45:12 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E7=94=A8=E4=BE=8B=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=A4=9A=E9=A1=B9=E7=9B=AE=E6=83=85=E5=86=B5=E4=B8=8B=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E6=A8=A1=E5=9D=97=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1049199 --user=王旭 【测试计划】计划详情-接口用例/场景用例列表-筛选-所属模块筛选未搜索到数据 https://www.tapd.cn/55049933/s/1613503
---
 .../plan/mapper/ExtTestPlanApiCaseMapper.xml  | 18 +++++++++--
 .../mapper/ExtTestPlanApiScenarioMapper.xml   | 18 +++++++++--
 .../ExtTestPlanFunctionalCaseMapper.xml       | 32 ++++++++++++++++---
 3 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanApiCaseMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanApiCaseMapper.xml
index f7b5dd543d..be1c23dd08 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanApiCaseMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanApiCaseMapper.xml
@@ -511,13 +511,27 @@
                                 <when test="condition.operator == 'IN'">
                                     concat(a.project_id, '_', a.module_id)  in
                                     <foreach collection="condition.value" item="v" separator="," open="(" close=")">
-                                        #{v}
+                                        <choose>
+                                            <when test="v.contains('_root')">
+                                                #{v}
+                                            </when>
+                                            <otherwise>
+                                                concat(a.project_id, '_', #{v})
+                                            </otherwise>
+                                        </choose>
                                     </foreach>
                                 </when>
                                 <when test="condition.operator == 'NOT_IN'">
                                     concat(a.project_id, '_', a.module_id) not in
                                     <foreach collection="condition.value" item="v" separator="," open="(" close=")">
-                                        #{v}
+                                        <choose>
+                                            <when test="v.contains('_root')">
+                                                #{v}
+                                            </when>
+                                            <otherwise>
+                                                concat(a.project_id, '_', #{v})
+                                            </otherwise>
+                                        </choose>
                                     </foreach>
                                 </when>
                             </choose>
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanApiScenarioMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanApiScenarioMapper.xml
index 3bb3871133..01df9caa4a 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanApiScenarioMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanApiScenarioMapper.xml
@@ -275,13 +275,27 @@
                                 <when test="condition.operator == 'IN'">
                                     concat(api_scenario.project_id, '_', api_scenario.module_id)  in
                                     <foreach collection="condition.value" item="v" separator="," open="(" close=")">
-                                        #{v}
+                                        <choose>
+                                            <when test="v.contains('_root')">
+                                                #{v}
+                                            </when>
+                                            <otherwise>
+                                                concat(api_scenario.project_id, '_', #{v})
+                                            </otherwise>
+                                        </choose>
                                     </foreach>
                                 </when>
                                 <when test="condition.operator == 'NOT_IN'">
                                     concat(api_scenario.project_id, '_', api_scenario.module_id) not in
                                     <foreach collection="condition.value" item="v" separator="," open="(" close=")">
-                                        #{v}
+                                        <choose>
+                                            <when test="v.contains('_root')">
+                                                #{v}
+                                            </when>
+                                            <otherwise>
+                                                concat(api_scenario.project_id, '_', #{v})
+                                            </otherwise>
+                                        </choose>
                                     </foreach>
                                 </when>
                             </choose>
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanFunctionalCaseMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanFunctionalCaseMapper.xml
index aca7ad8a04..c14adb2fdf 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanFunctionalCaseMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanFunctionalCaseMapper.xml
@@ -316,10 +316,34 @@
                         </include>
                         <!-- 所属模块(项目ID_模块ID 组合查询) -->
                         <if test="condition.name == 'moduleId'">
-                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                                <property name="condition" value="condition"/>
-                                <property name="column" value="functional_case.module_id"/>
-                            </include>
+                            <choose>
+                                <when test="condition.operator == 'IN'">
+                                    concat(functional_case.project_id, '_', functional_case.module_id)  in
+                                    <foreach collection="condition.value" item="v" separator="," open="(" close=")">
+                                        <choose>
+                                            <when test="v.contains('_root')">
+                                                #{v}
+                                            </when>
+                                            <otherwise>
+                                                concat(functional_case.project_id, '_', #{v})
+                                            </otherwise>
+                                        </choose>
+                                    </foreach>
+                                </when>
+                                <when test="condition.operator == 'NOT_IN'">
+                                    concat(functional_case.project_id, '_', functional_case.module_id) not in
+                                    <foreach collection="condition.value" item="v" separator="," open="(" close=")">
+                                        <choose>
+                                            <when test="v.contains('_root')">
+                                                #{v}
+                                            </when>
+                                            <otherwise>
+                                                concat(functional_case.project_id, '_', #{v})
+                                            </otherwise>
+                                        </choose>
+                                    </foreach>
+                                </when>
+                            </choose>
                         </if>
                         <!-- 测试点 -->
                         <if test="condition.name == 'testPlanCollectionId'">