From a54d338dffdefda878abdcc329c24178e3de2a69 Mon Sep 17 00:00:00 2001
From: AgAngle <1323481023@qq.com>
Date: Fri, 13 Sep 2024 16:30:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B):=20?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E4=BB=BB=E4=B8=80=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=A3=80=E7=B4=A2=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1046344 --user=陈建星 【接口测试】定义-筛选-符合以下条件选中“任一”筛选结果错误 https://www.tapd.cn/55049933/s/1578363
---
 .../api/mapper/ExtApiDefinitionMapper.xml     |   6 +-
 .../ExtCaseReviewFunctionalCaseMapper.xml     | 130 +++++++++---------
 .../mapper/ExtFunctionalCaseMapper.xml        | 130 +++++++++---------
 3 files changed, 136 insertions(+), 130 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
index 4ffbc67fdf..e483b06cd3 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
@@ -363,8 +363,9 @@
     </sql>
 
     <sql id="combine">
-        <trim prefix="AND" suffixOverrides="AND|OR">
-            <if test="${combineSearch} != null">
+        <trim prefix="AND">
+            <trim prefix="(" suffix=")" suffixOverrides="AND|OR">
+                <if test="${combineSearch} != null">
                 <foreach collection="${combineSearch}.userViewConditions" item="condition">
                     <if test="condition.name == 'createUser'">
                         <include refid="io.metersphere.system.mapper.BaseMapper.condition">
@@ -425,6 +426,7 @@
                     <property name="combineSearch" value="${combineSearch}"/>
                 </include>
             </if>
+            </trim>
         </trim>
     </sql>
 
diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewFunctionalCaseMapper.xml b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewFunctionalCaseMapper.xml
index d726271a5c..a7035cf6bd 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewFunctionalCaseMapper.xml
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewFunctionalCaseMapper.xml
@@ -135,74 +135,76 @@
     </sql>
 
     <sql id="combine">
-        <trim prefix="AND" suffixOverrides="AND|OR">
-            <if test="${combineSearch} != null">
-                <foreach collection="${combineSearch}.userViewConditions" item="condition">
-                    <if test="condition.name == 'createUser'">
-                        <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                            <property name="condition" value="condition"/>
-                            <property name="column" value="functional_case.create_user"/>
+        <trim prefix="AND">
+            <trim prefix="(" suffix=")" suffixOverrides="AND|OR">
+                <if test="${combineSearch} != null">
+                    <foreach collection="${combineSearch}.userViewConditions" item="condition">
+                        <if test="condition.name == 'createUser'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="functional_case.create_user"/>
+                            </include>
+                        </if>
+                        <if test="condition.name == 'reviewers'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.associationCondition">
+                                <property name="mainIdColumn" value="crfc.case_id"/>
+                                <property name="associationTable" value="case_review_functional_case_user"/>
+                                <property name="associationIdColumn" value="case_id"/>
+                                <property name="searchColumn" value="user_id"/>
+                                <property name="condition" value="condition"/>
+                            </include>
+                        </if>
+                        <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
+                            <property name="searchMode" value="${combineSearch}.searchMode"/>
                         </include>
-                    </if>
-                    <if test="condition.name == 'reviewers'">
-                        <include refid="io.metersphere.system.mapper.BaseMapper.associationCondition">
-                            <property name="mainIdColumn" value="crfc.case_id"/>
-                            <property name="associationTable" value="case_review_functional_case_user"/>
-                            <property name="associationIdColumn" value="case_id"/>
-                            <property name="searchColumn" value="user_id"/>
+                    </foreach>
+                    <foreach collection="${combineSearch}.systemFieldConditions" item="condition">
+                        <include refid="io.metersphere.system.mapper.BaseMapper.commonSystemFieldConditions">
                             <property name="condition" value="condition"/>
+                            <property name="tablePrefix" value="functional_case"/>
                         </include>
-                    </if>
-                    <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
-                        <property name="searchMode" value="${combineSearch}.searchMode"/>
+                        <if test="condition.name == 'status'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="crfc.status"/>
+                            </include>
+                        </if>
+                        <if test="condition.name == 'lastExecuteResult'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="functional_case.last_execute_result"/>
+                            </include>
+                        </if>
+                        <if test="condition.name == 'demand'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.associationCondition">
+                                <property name="mainIdColumn" value="functional_case.id"/>
+                                <property name="associationTable" value="functional_case_demand"/>
+                                <property name="associationIdColumn" value="case_id"/>
+                                <property name="searchColumn" value="demand_name"/>
+                                <property name="condition" value="condition"/>
+                            </include>
+                        </if>
+                        <if test="condition.name == 'attachment'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.associationCondition">
+                                <property name="mainIdColumn" value="functional_case.id"/>
+                                <property name="associationTable" value="functional_case_attachment"/>
+                                <property name="associationIdColumn" value="case_id"/>
+                                <property name="searchColumn" value="file_name"/>
+                                <property name="condition" value="condition"/>
+                            </include>
+                        </if>
+                        <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
+                            <property name="searchMode" value="${combineSearch}.searchMode"/>
+                        </include>
+                    </foreach>
+                    <include refid="io.metersphere.system.mapper.BaseMapper.customFiledConditions">
+                        <property name="mainIdColumn" value="functional_case.id"/>
+                        <property name="associationTable" value="functional_case_custom_field"/>
+                        <property name="associationIdColumn" value="case_id"/>
+                        <property name="combineSearch" value="${combineSearch}"/>
                     </include>
-                </foreach>
-                <foreach collection="${combineSearch}.systemFieldConditions" item="condition">
-                    <include refid="io.metersphere.system.mapper.BaseMapper.commonSystemFieldConditions">
-                        <property name="condition" value="condition"/>
-                        <property name="tablePrefix" value="functional_case"/>
-                    </include>
-                    <if test="condition.name == 'status'">
-                        <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                            <property name="condition" value="condition"/>
-                            <property name="column" value="crfc.status"/>
-                        </include>
-                    </if>
-                    <if test="condition.name == 'lastExecuteResult'">
-                        <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                            <property name="condition" value="condition"/>
-                            <property name="column" value="functional_case.last_execute_result"/>
-                        </include>
-                    </if>
-                    <if test="condition.name == 'demand'">
-                        <include refid="io.metersphere.system.mapper.BaseMapper.associationCondition">
-                            <property name="mainIdColumn" value="functional_case.id"/>
-                            <property name="associationTable" value="functional_case_demand"/>
-                            <property name="associationIdColumn" value="case_id"/>
-                            <property name="searchColumn" value="demand_name"/>
-                            <property name="condition" value="condition"/>
-                        </include>
-                    </if>
-                    <if test="condition.name == 'attachment'">
-                        <include refid="io.metersphere.system.mapper.BaseMapper.associationCondition">
-                            <property name="mainIdColumn" value="functional_case.id"/>
-                            <property name="associationTable" value="functional_case_attachment"/>
-                            <property name="associationIdColumn" value="case_id"/>
-                            <property name="searchColumn" value="file_name"/>
-                            <property name="condition" value="condition"/>
-                        </include>
-                    </if>
-                    <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
-                        <property name="searchMode" value="${combineSearch}.searchMode"/>
-                    </include>
-                </foreach>
-                <include refid="io.metersphere.system.mapper.BaseMapper.customFiledConditions">
-                    <property name="mainIdColumn" value="functional_case.id"/>
-                    <property name="associationTable" value="functional_case_custom_field"/>
-                    <property name="associationIdColumn" value="case_id"/>
-                    <property name="combineSearch" value="${combineSearch}"/>
-                </include>
-            </if>
+                </if>
+            </trim>
         </trim>
     </sql>
 
diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
index 73381a2dd4..1afc4c85b6 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
@@ -282,74 +282,76 @@
     </sql>
 
     <sql id="combine">
-        <trim prefix="AND" suffixOverrides="AND|OR">
-            <if test="${combineSearch} != null">
-                <foreach collection="${combineSearch}.userViewConditions" item="condition">
-                    <if test="condition.name == 'createUser'">
-                        <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                            <property name="condition" value="condition"/>
-                            <property name="column" value="functional_case.create_user"/>
+        <trim prefix="AND">
+            <trim prefix="(" suffix=")" suffixOverrides="AND|OR">
+                <if test="${combineSearch} != null">
+                    <foreach collection="${combineSearch}.userViewConditions" item="condition">
+                        <if test="condition.name == 'createUser'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="functional_case.create_user"/>
+                            </include>
+                        </if>
+                        <if test="condition.name == 'follower'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.associationCondition">
+                                <property name="mainIdColumn" value="functional_case.id"/>
+                                <property name="associationTable" value="functional_case_follower"/>
+                                <property name="associationIdColumn" value="case_id"/>
+                                <property name="searchColumn" value="user_id"/>
+                                <property name="condition" value="condition"/>
+                            </include>
+                        </if>
+                        <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
+                            <property name="searchMode" value="${combineSearch}.searchMode"/>
                         </include>
-                    </if>
-                    <if test="condition.name == 'follower'">
-                        <include refid="io.metersphere.system.mapper.BaseMapper.associationCondition">
-                            <property name="mainIdColumn" value="functional_case.id"/>
-                            <property name="associationTable" value="functional_case_follower"/>
-                            <property name="associationIdColumn" value="case_id"/>
-                            <property name="searchColumn" value="user_id"/>
+                    </foreach>
+                    <foreach collection="${combineSearch}.systemFieldConditions" item="condition">
+                        <include refid="io.metersphere.system.mapper.BaseMapper.commonSystemFieldConditions">
                             <property name="condition" value="condition"/>
+                            <property name="tablePrefix" value="functional_case"/>
                         </include>
-                    </if>
-                    <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
-                        <property name="searchMode" value="${combineSearch}.searchMode"/>
+                        <if test="condition.name == 'reviewStatus'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="functional_case.review_status"/>
+                            </include>
+                        </if>
+                        <if test="condition.name == 'lastExecuteResult'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="functional_case.last_execute_result"/>
+                            </include>
+                        </if>
+                        <if test="condition.name == 'demand'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.associationCondition">
+                                <property name="mainIdColumn" value="functional_case.id"/>
+                                <property name="associationTable" value="functional_case_demand"/>
+                                <property name="associationIdColumn" value="case_id"/>
+                                <property name="searchColumn" value="demand_name"/>
+                                <property name="condition" value="condition"/>
+                            </include>
+                        </if>
+                        <if test="condition.name == 'attachment'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.associationCondition">
+                                <property name="mainIdColumn" value="functional_case.id"/>
+                                <property name="associationTable" value="functional_case_attachment"/>
+                                <property name="associationIdColumn" value="case_id"/>
+                                <property name="searchColumn" value="file_name"/>
+                                <property name="condition" value="condition"/>
+                            </include>
+                        </if>
+                        <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
+                            <property name="searchMode" value="${combineSearch}.searchMode"/>
+                        </include>
+                    </foreach>
+                    <include refid="io.metersphere.system.mapper.BaseMapper.customFiledConditions">
+                        <property name="mainIdColumn" value="functional_case.id"/>
+                        <property name="associationTable" value="functional_case_custom_field"/>
+                        <property name="associationIdColumn" value="case_id"/>
+                        <property name="combineSearch" value="${combineSearch}"/>
                     </include>
-                </foreach>
-                <foreach collection="${combineSearch}.systemFieldConditions" item="condition">
-                    <include refid="io.metersphere.system.mapper.BaseMapper.commonSystemFieldConditions">
-                        <property name="condition" value="condition"/>
-                        <property name="tablePrefix" value="functional_case"/>
-                    </include>
-                    <if test="condition.name == 'reviewStatus'">
-                        <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                            <property name="condition" value="condition"/>
-                            <property name="column" value="functional_case.review_status"/>
-                        </include>
-                    </if>
-                    <if test="condition.name == 'lastExecuteResult'">
-                        <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                            <property name="condition" value="condition"/>
-                            <property name="column" value="functional_case.last_execute_result"/>
-                        </include>
-                    </if>
-                    <if test="condition.name == 'demand'">
-                        <include refid="io.metersphere.system.mapper.BaseMapper.associationCondition">
-                            <property name="mainIdColumn" value="functional_case.id"/>
-                            <property name="associationTable" value="functional_case_demand"/>
-                            <property name="associationIdColumn" value="case_id"/>
-                            <property name="searchColumn" value="demand_name"/>
-                            <property name="condition" value="condition"/>
-                        </include>
-                    </if>
-                    <if test="condition.name == 'attachment'">
-                        <include refid="io.metersphere.system.mapper.BaseMapper.associationCondition">
-                            <property name="mainIdColumn" value="functional_case.id"/>
-                            <property name="associationTable" value="functional_case_attachment"/>
-                            <property name="associationIdColumn" value="case_id"/>
-                            <property name="searchColumn" value="file_name"/>
-                            <property name="condition" value="condition"/>
-                        </include>
-                    </if>
-                    <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
-                        <property name="searchMode" value="${combineSearch}.searchMode"/>
-                    </include>
-                </foreach>
-                <include refid="io.metersphere.system.mapper.BaseMapper.customFiledConditions">
-                    <property name="mainIdColumn" value="functional_case.id"/>
-                    <property name="associationTable" value="functional_case_custom_field"/>
-                    <property name="associationIdColumn" value="case_id"/>
-                    <property name="combineSearch" value="${combineSearch}"/>
-                </include>
-            </if>
+                </if>
+            </trim>
         </trim>
     </sql>