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>