From 7aa6be4a7238c8131c233b2c6c701aac629ad094 Mon Sep 17 00:00:00 2001
From: AgAngle <1323481023@qq.com>
Date: Mon, 23 Sep 2024 10:33:17 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E4=B8=8D=E7=AD=89=E4=BA=8E?=
 =?UTF-8?q?=E7=AD=89=E6=9D=A1=E4=BB=B6=EF=BC=8C=E6=90=9C=E7=B4=A2=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1046849 --user=陈建星 【接口测试】接口定义-筛选-路径不等于筛选时没有统计 非HTTP协议的接口数据 https://www.tapd.cn/55049933/s/1582908
---
 .../metersphere/api/service/scenario/ApiScenarioService.java   | 2 --
 .../src/main/java/io/metersphere/system/mapper/BaseMapper.xml  | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioService.java
index 3414a3b065..06159197f3 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioService.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioService.java
@@ -175,8 +175,6 @@ public class ApiScenarioService extends MoveNodeService {
 
 
     public List<ApiScenarioDTO> getScenarioPage(ApiScenarioPageRequest request, boolean isRepeat, String testPlanId) {
-        //CustomFieldUtils.setBaseQueryRequestCustomMultipleFields(request, userId);
-        //TODO  场景的自定义字段 等设计 不一定会有
         List<ApiScenarioDTO> list = extApiScenarioMapper.list(request, isRepeat, testPlanId);
         if (CollectionUtils.isNotEmpty(list)) {
             processApiScenario(list);
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/BaseMapper.xml b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/BaseMapper.xml
index 32cb364210..e650684ecc 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/BaseMapper.xml
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/BaseMapper.xml
@@ -214,6 +214,7 @@
                 <when test="${condition}.operator == 'NOT_CONTAINS'">
                     <foreach collection="${condition}.value.split(' ')" item="item" separator="or">
                         ${column} not like CONCAT('%', #{item},'%')
+                        or ${column} is null
                     </foreach>
                 </when>
                 <when test="${condition}.operator == 'IN'">
@@ -239,6 +240,7 @@
                     <foreach collection="${condition}.value" item="v" separator="," open="(" close=")">
                         #{v}
                     </foreach>
+                    or ${column} is null
                 </when>
                 <when test="${condition}.operator == 'BETWEEN'">
                     ${column} between #{condition.value[0]} and #{condition.value[1]}
@@ -266,6 +268,7 @@
                 </when>
                 <when test="${condition}.operator == 'NOT_EQUALS'">
                     ${column} != #{condition.value}
+                    or ${column} is null
                 </when>
             </choose>
         </trim>