diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMockMapper.java b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMockMapper.java
index 4d664c5de9..baca3e2468 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMockMapper.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMockMapper.java
@@ -5,17 +5,21 @@ import io.metersphere.api.dto.definition.ApiDefinitionMockDTO;
 import io.metersphere.api.dto.definition.ApiMockWithBlob;
 import io.metersphere.api.dto.definition.ApiTestCaseBatchRequest;
 import io.metersphere.api.dto.definition.request.ApiDefinitionMockPageRequest;
+import io.metersphere.system.interceptor.BaseConditionFilter;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface ExtApiDefinitionMockMapper {
 
+    @BaseConditionFilter
     List<ApiDefinitionMockDTO> list(@Param("request") ApiDefinitionMockPageRequest request);
 
     List<String> getIdsByApiIds(@Param("ids") List<String> ids);
 
-    List<String> getIds(@Param("request")ApiTestCaseBatchRequest request);
+    @BaseConditionFilter
+    List<String> getIds(@Param("request") ApiTestCaseBatchRequest request);
+
     List<ApiDefinitionMock> getTagsByIds(@Param("ids") List<String> ids);
 
     List<ApiDefinitionMock> getMockInfoByIds(@Param("ids") List<String> ids);
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMockMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMockMapper.xml
index 02f6bc4599..e34d3dbedc 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMockMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMockMapper.xml
@@ -108,6 +108,9 @@
             <property name="filter" value="request.condition.filter"/>
         </include>
 
+        <include refid="combine">
+            <property name="combineSearch" value="request.condition.combineSearch"/>
+        </include>
     </sql>
 
 
@@ -144,13 +147,9 @@
             <property name="filter" value="request.filter"/>
         </include>
 
-        <if test="request.combine != null and request.combine != ''">
-            <include refid="combine">
-                <property name="condition" value="request.combine"/>
-                <property name="name" value="request.name"/>
-                <property name="ObjectTags" value="request.combine.tags"/>
-            </include>
-        </if>
+        <include refid="combine">
+            <property name="combineSearch" value="request.combineSearch"/>
+        </include>
     </sql>
 
 
@@ -174,56 +173,52 @@
     </sql>
 
     <sql id="combine">
-        <if test='${condition}.name != null and (${name} == null or ${name} == "")'>
-            and m.name
-            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                <property name="object" value="${condition}.name"/>
-            </include>
-        </if>
-
-        <if test="${condition}.updateTime != null">
-            and m.update_time
-            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                <property name="object" value="${condition}.updateTime"/>
-            </include>
-        </if>
-
-        <if test="${condition}.createTime != null">
-            and m.create_time
-            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                <property name="object" value="${condition}.createTime"/>
-            </include>
-        </if>
-
-        <if test="${condition}.createUser != null">
-            and m.create_user
-            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                <property name="object" value="${condition}.createUser"/>
-            </include>
-        </if>
-
-        <if test="${condition}.enable != null">
-            and m.enable
-            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                <property name="object" value="${condition}.enable"/>
-            </include>
-        </if>
-
-        <if test='${condition}.tags != null and ${ObjectTags}.operator == "not like"'>
-            and (m.tags is null or m.tags
-            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                <property name="object" value="${condition}.tags"/>
-            </include>
-            )
-        </if>
-
-        <if test='${condition}.tags != null and ${ObjectTags}.operator == "like"'>
-            and m.tags
-            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                <property name="object" value="${condition}.tags"/>
-            </include>
-        </if>
-
+        <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="api_definition_mock.create_user"/>
+                            </include>
+                        </if>
+                        <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
+                            <property name="searchMode" value="${combineSearch}.searchMode"/>
+                        </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="m"/>
+                        </include>
+                        <!-- 协议 -->
+                        <if test="condition.name == 'protocol'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="d.protocol"/>
+                            </include>
+                        </if>
+                        <!-- 请求类型 -->
+                        <if test="condition.name == 'method'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="d.method"/>
+                            </include>
+                        </if>
+                        <!-- 状态 -->
+                        <if test="condition.name == 'status'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="m.enable"/>
+                            </include>
+                        </if>
+                        <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
+                            <property name="searchMode" value="${combineSearch}.searchMode"/>
+                        </include>
+                    </foreach>
+                </if>
+            </trim>
+        </trim>
     </sql>
-
 </mapper>
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.java b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.java
index ab47548910..0394f3a5a9 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.java
@@ -12,6 +12,7 @@ import io.metersphere.request.AssociateOtherCaseRequest;
 import io.metersphere.request.TestCasePageProviderRequest;
 import io.metersphere.system.dto.sdk.BaseTreeNode;
 import io.metersphere.system.dto.sdk.OptionDTO;
+import io.metersphere.system.interceptor.BaseConditionFilter;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -26,8 +27,10 @@ public interface ExtApiTestCaseMapper {
 
     Long getPos(@Param("projectId") String projectId);
 
+    @BaseConditionFilter
     List<ApiTestCaseDTO> listByRequest(@Param("request") ApiTestCasePageRequest request, @Param("deleted") boolean deleted, @Param("isRepeat") boolean isRepeat, @Param("testPlanId") String testPlanId);
 
+    @BaseConditionFilter
     List<String> getIds(@Param("request") ApiTestCaseBatchRequest request, @Param("deleted") boolean deleted);
 
     void batchMoveGc(@Param("ids") List<String> ids, @Param("userId") String userId, @Param("deleteTime") long deleteTime);
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml
index 5f8de80517..6392be0c4f 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml
@@ -486,6 +486,9 @@
         <include refid="filters">
             <property name="filter" value="request.condition.filter"/>
         </include>
+        <include refid="combine">
+            <property name="combineSearch" value="request.condition.combineSearch"/>
+        </include>
         <include refid="queryVersionCondition">
             <property name="versionTable" value="atc"/>
         </include>
@@ -521,6 +524,9 @@
         <include refid="filters">
             <property name="filter" value="request.filter"/>
         </include>
+        <include refid="combine">
+            <property name="combineSearch" value="request.combineSearch"/>
+        </include>
         <include refid="queryVersionCondition">
             <property name="versionTable" value="atc"/>
         </include>
@@ -573,6 +579,125 @@
         </if>
     </sql>
 
+    <sql id="combine">
+        <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="api_test_case.create_user"/>
+                            </include>
+                        </if>
+                        <if test="condition.name == 'follower'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.associationCondition">
+                                <property name="mainIdColumn" value="api_test_case.id"/>
+                                <property name="associationTable" value="api_test_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>
+                    </foreach>
+                    <foreach collection="${combineSearch}.systemFieldConditions" item="condition">
+                        <include refid="io.metersphere.system.mapper.BaseMapper.commonSystemFieldConditions">
+                            <property name="condition" value="condition"/>
+                            <property name="tablePrefix" value="atc"/>
+                        </include>
+                        <!-- 协议 -->
+                        <if test="condition.name == 'protocol'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="a.protocol"/>
+                            </include>
+                        </if>
+                        <!-- 用例等级 -->
+                        <if test="condition.name == 'priority'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="atc.priority"/>
+                            </include>
+                        </if>
+                        <!-- 路径 -->
+                        <if test="condition.name == 'path'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="a.path"/>
+                            </include>
+                        </if>
+                        <!-- 状态 -->
+                        <if test="condition.name == 'status'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="atc.status"/>
+                            </include>
+                        </if>
+                        <!-- 用例通过率 -->
+                        <if test="condition.name == 'passRate'">
+                            <choose>
+                                <when test="condition.operator == 'NOT_EMPTY'">
+                                    atc.id in (
+                                        select atcr.api_test_case_id as id
+                                        from api_report ar left join api_test_case_record atcr on atcr.api_report_id = ar.id
+                                        group by atcr.api_test_case_id
+                                    )
+                                </when>
+                                <when test="condition.operator == 'EMPTY'">
+                                    atc.id not in (
+                                        select atcr.api_test_case_id as id
+                                        from api_report ar left join api_test_case_record atcr on atcr.api_report_id = ar.id
+                                        group by atcr.api_test_case_id
+                                    )
+                                </when>
+                                <when test="(condition.operator == 'LT' and condition.value == 0) or (condition.operator == 'GT' and condition.value &gt; 100 )">
+                                    1=2
+                                </when>
+                                <otherwise>
+                                    atc.id in (
+                                        select atcr.api_test_case_id as id, format(sum(if(ar.`status` = 'success', 1, 0)) / count(ar.id) * 100, 2) as passRate
+                                        from api_report ar left join api_test_case_record atcr on atcr.api_report_id = ar.id
+                                        group by atcr.api_test_case_id having
+                                        <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                            <property name="condition" value="condition"/>
+                                            <property name="column" value="passRate"/>
+                                        </include>
+                                    )
+                                </otherwise>
+                            </choose>
+                        </if>
+                        <!-- 用例环境 -->
+                        <if test="condition.name == 'env'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="atc.environment_id"/>
+                            </include>
+                        </if>
+                        <!-- 执行结果 -->
+                        <if test="condition.name == 'lastReportStatus'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="atc.last_report_status"/>
+                            </include>
+                        </if>
+                        <if test="condition.name == 'apiChange'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="atc.api_change"/>
+                            </include>
+                        </if>
+                        <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
+                            <property name="searchMode" value="${combineSearch}.searchMode"/>
+                        </include>
+                    </foreach>
+                </if>
+            </trim>
+        </trim>
+    </sql>
+
     <sql id="queryVersionCondition">
         <if test="request.versionId != null and request.versionId != ''">
             and ${versionTable}.version_id = #{request.versionId}
diff --git a/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.java b/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.java
index 6145bdc4e7..19d61df4f9 100644
--- a/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.java
+++ b/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.java
@@ -7,6 +7,7 @@ import io.metersphere.bug.dto.response.BugTagEditDTO;
 import io.metersphere.dto.BugProviderDTO;
 import io.metersphere.request.AssociateBugRequest;
 import io.metersphere.request.BugPageProviderRequest;
+import io.metersphere.system.interceptor.BaseConditionFilter;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -20,6 +21,7 @@ public interface ExtBugMapper {
      * @param sort    排序参数
      * @return 缺陷列表
      */
+    @BaseConditionFilter
     List<BugDTO> list(@Param("request") BugPageRequest request, @Param("sort") String sort);
 
     /**
@@ -28,6 +30,7 @@ public interface ExtBugMapper {
      * @param request 请求查询参数
      * @return 缺陷列表
      */
+    @BaseConditionFilter
     List<String> getIdsByPageRequest(@Param("request") BugPageRequest request);
 
     /**
@@ -95,6 +98,7 @@ public interface ExtBugMapper {
      * @param deleted 是否删除
      * @return 缺陷集合
      */
+    @BaseConditionFilter
     List<BugProviderDTO> listByProviderRequest(@Param("table") String sourceType, @Param("sourceName") String sourceName, @Param("bugColumnName") String bugColumnName, @Param("request") BugPageProviderRequest bugPageProviderRequest, @Param("deleted") boolean deleted);
 
     /**
@@ -103,5 +107,6 @@ public interface ExtBugMapper {
      * @param deleted 是否删除
      * @return 缺陷ID集合
      */
+    @BaseConditionFilter
     List<String> getIdsByProvider(@Param("request") AssociateBugRequest request, @Param("deleted") boolean deleted);
 }
diff --git a/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.xml b/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.xml
index 8687424058..ac6134682b 100644
--- a/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.xml
+++ b/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.xml
@@ -159,9 +159,9 @@
             </if>
             <include refid="filter"/>
             <include refid="combine">
-                <property name="condition" value="request.combine"/>
-                <property name="searchMode" value="request.searchMode"/>
-                <property name="combineTag" value="request.combine.tag"/>
+                <property name="combineSearch" value="request.combineSearch"/>
+                <property name="projectId" value="${request.projectId}"/>
+                <property name="deleted" value="${request.useTrash}"/>
             </include>
         </where>
     </sql>
@@ -224,181 +224,109 @@
     </sql>
 
     <sql id="combine">
-        <if test="request.combine != null">
-            and (
-                <!-- 任意/所有拼接 -->
-                <include refid="prefixMode">
-                    <property name="searchMode" value="${searchMode}"/>
-                </include>
-                <!-- ID -->
-                <if test='${condition}.num != null'>
-                    <include refid="queryType">
-                        <property name="searchMode" value="${searchMode}"/>
-                    </include>
-                    b.num
-                    <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                        <property name="object" value="${condition}.num"/>
-                    </include>
-                </if>
-                <!-- 名称 -->
-                <if test='${condition}.title != null'>
-                    <include refid="queryType">
-                        <property name="searchMode" value="${searchMode}"/>
-                    </include>
-                    b.title
-                    <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                        <property name="object" value="${condition}.title"/>
-                    </include>
-                </if>
-                <!-- 所属平台 -->
-                <if test='${condition}.platform != null'>
-                    <include refid="queryType">
-                        <property name="searchMode" value="${searchMode}"/>
-                    </include>
-                    b.platform
-                    <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                        <property name="object" value="${condition}.platform"/>
-                    </include>
-                </if>
-                <!-- 处理人 -->
-                <if test='${condition}.handleUser != null'>
-                    <include refid="queryType">
-                        <property name="searchMode" value="${searchMode}"/>
-                    </include>
-                    b.handle_user
-                    <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                        <property name="object" value="${condition}.handleUser"/>
-                    </include>
-                </if>
-                <!-- 状态 -->
-                <if test='${condition}.status != null'>
-                    <include refid="queryType">
-                        <property name="searchMode" value="${searchMode}"/>
-                    </include>
-                    b.status
-                    <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                        <property name="object" value="${condition}.status"/>
-                    </include>
-                </if>
-                <!-- 创建人 -->
-                <if test='${condition}.createUser != null'>
-                    <include refid="queryType">
-                        <property name="searchMode" value="${searchMode}"/>
-                    </include>
-                    b.create_user
-                    <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                        <property name="object" value="${condition}.createUser"/>
-                    </include>
-                </if>
-                <!-- 创建时间 -->
-                <if test='${condition}.createTime != null'>
-                    <include refid="queryType">
-                        <property name="searchMode" value="${searchMode}"/>
-                    </include>
-                    b.create_time
-                    <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                        <property name="object" value="${condition}.createTime"/>
-                    </include>
-                </if>
-                <!-- 标签 -->
-                <if test='${condition}.tags != null'>
-                    <include refid="queryTag">
-                        <property name="searchMode" value="${searchMode}"/>
-                        <property name="combineTag" value="${condition}.tags"/>
-                    </include>
-                </if>
-                <!-- 自定义字段 -->
-                <if test="${condition}.customs != null and ${condition}.customs.size() > 0">
-                    <foreach collection="${condition}.customs" item="custom" separator="" open="" close="">
-                        <if test="custom.value != ''">
-                            <include refid="queryType">
-                                <property name="searchMode" value="${searchMode}"/>
+        <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="bug.create_user"/>
                             </include>
-                            <if test='custom.operator == "not like" or custom.operator == "not in"'>
-                                b.id not in (
-                            </if>
-                            <if test='custom.operator != "not like" and custom.operator != "not in"'>
-                                b.id in (
-                            </if>
-                            select bug_id from bug_custom_field where field_id = #{custom.id} and
+                        </if>
+                        <if test="condition.name == 'follower'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.associationCondition">
+                                <property name="mainIdColumn" value="bug.id"/>
+                                <property name="associationTable" value="bug_follower"/>
+                                <property name="associationIdColumn" value="bug_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>
+                    </foreach>
+                    <foreach collection="${combineSearch}.systemFieldConditions" item="condition">
+                        <include refid="io.metersphere.system.mapper.BaseMapper.commonSystemFieldConditions">
+                            <property name="condition" value="condition"/>
+                            <property name="tablePrefix" value="b"/>
+                        </include>
+                        <!-- 状态 -->
+                        <if test="condition.name == 'status'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="b.status"/>
+                            </include>
+                        </if>
+                        <!-- 处理人 -->
+                        <if test="condition.name == 'handleUser'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="b.handle_user"/>
+                            </include>
+                        </if>
+                        <!-- 所属平台 -->
+                        <if test="condition.name == 'platform'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="b.platform"/>
+                            </include>
+                        </if>
+                        <!-- 用例数 -->
+                        <if test="condition.name == 'caseTotal'">
                             <choose>
-                                <when test="custom.type == 'array'">
-                                    <foreach collection="custom.value" item="val" separator="or" open="(" close=")">
-                                        JSON_CONTAINS(`value`, JSON_ARRAY(#{val}))
-                                    </foreach>
+                                <when test="condition.operator == 'NOT_EMPTY'">
+                                    b.id in (
+                                        select distinct b.id from bug b join bug_relation_case brc on b.id = brc.bug_id
+                                        where deleted = ${deleted} and project_id = '${projectId}'
+                                    )
                                 </when>
-                                <when test="custom.type == 'time'">
-                                    left(replace(unix_timestamp(trim(both '"' from `value`)), '.', ''), 13)
-                                    <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                                        <property name="object" value="custom"/>
-                                    </include>
+                                <when test="condition.operator == 'EMPTY'">
+                                    b.id not in (
+                                        select distinct b.id from bug b join bug_relation_case brc on b.id = brc.bug_id
+                                        where deleted = ${deleted} and project_id = '${projectId}'
+                                    )
+                                </when>
+                                <when test="(condition.operator == 'LT' and condition.value &lt; 1) or (condition.operator == 'EQUALS' and condition.value &lt; 0)">
+                                    1=2
                                 </when>
                                 <otherwise>
-                                    trim(both '"' from `value`)
-                                    <include refid="io.metersphere.system.mapper.BaseMapper.condition">
-                                        <property name="object" value="custom"/>
-                                    </include>
+                                    <if test="condition.operator == 'LT' or (condition.operator == 'EQUALS' and condition.value == 0)">
+                                        b.id not in (
+                                            select distinct b.id from bug b join bug_relation_case brc on b.id = brc.bug_id
+                                            where deleted = ${deleted} and project_id = '${projectId}'
+                                        )
+                                        <if test="condition.value &gt; 1">
+                                            OR
+                                        </if>
+                                    </if>
+                                    <if test="(condition.operator == 'EQUALS' and condition.value &gt; 0) or (condition.operator == 'LT' and condition.value &gt; 1) or condition.operator == 'GT'">
+                                        b.id in (
+                                            select distinct b.id from bug b join bug_relation_case brc on b.id = brc.bug_id
+                                            where deleted = ${deleted} and project_id = '${projectId}' group b.id having
+                                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                                <property name="condition" value="condition"/>
+                                                <property name="column" value="count(b.id)"/>
+                                            </include>
+                                        )
+                                    </if>
                                 </otherwise>
                             </choose>
-                            )
                         </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="bug.id"/>
+                        <property name="associationTable" value="bug_custom_field"/>
+                        <property name="associationIdColumn" value="bug_id"/>
+                        <property name="combineSearch" value="${combineSearch}"/>
+                    </include>
                 </if>
-            )
-        </if>
-    </sql>
-
-    <sql id="prefixMode">
-        <choose>
-            <when test='${searchMode} == "AND"'>
-                1 = 1
-            </when>
-            <when test='${searchMode} == "OR"'>
-                1 = 2
-            </when>
-        </choose>
-    </sql>
-
-    <sql id="queryType">
-        <choose>
-            <when test='${searchMode} == "AND"'>
-                and
-            </when>
-            <when test='${searchMode} == "OR"'>
-                or
-            </when>
-        </choose>
-    </sql>
-
-    <sql id="queryTag">
-        <!-- 不包含 -->
-        <if test='${combineTag}.value.size() > 0 and ${combineTag}.operator == "not like"'>
-            <include refid="queryType">
-                <property name="searchMode" value="${searchMode}"/>
-            </include>
-            (
-            b.tags is null or b.tags = '[]' or
-            <foreach collection="${combineTag}.value" item="tag" separator="and" open="(" close=")">
-                !JSON_CONTAINS(b.tags, JSON_ARRAY(#{tag}))
-            </foreach>
-            )
-        </if>
-        <!-- 包含 -->
-        <if test='${combineTag}.value.size() > 0 and ${combineTag}.operator == "like"'>
-            <include refid="queryType">
-                <property name="searchMode" value="${searchMode}"/>
-            </include>
-            <foreach collection="${combineTag}.value" item="tag" separator="or" open="(" close=")">
-                JSON_CONTAINS(b.tags, JSON_ARRAY(#{tag}))
-            </foreach>
-        </if>
-        <!-- 空 -->
-        <if test='${combineTag}.operator == "is null"'>
-            <include refid="queryType">
-                <property name="searchMode" value="${searchMode}"/>
-            </include>
-            (b.tags is null or b.tags = '[]')
-        </if>
+            </trim>
+        </trim>
     </sql>
 
     <sql id="queryWhereConditionByProvider">
@@ -414,8 +342,9 @@
         </if>
         <include refid="filter"/>
         <include refid="combine">
-            <property name="condition" value="request.combine"/>
-            <property name="searchMode" value="request.searchMode"/>
+            <property name="combineSearch" value="request.combineSearch"/>
+            <property name="projectId" value="${request.projectId}"/>
+            <property name="deleted" value="${request.useTrash}"/>
         </include>
     </sql>
 </mapper>
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/constants/UserViewType.java b/backend/services/system-setting/src/main/java/io/metersphere/system/constants/UserViewType.java
index 1f2a4358af..61919c22a0 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/constants/UserViewType.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/constants/UserViewType.java
@@ -21,7 +21,15 @@ public enum UserViewType implements ValueEnum {
             List.of(InternalUserView.ALL_DATA, InternalUserView.MY_REVIEW, InternalUserView.MY_CREATE)),
     API_DEFINITION("api-definition",
             List.of(InternalUserView.ALL_DATA, InternalUserView.MY_FOLLOW, InternalUserView.MY_CREATE)),
-    ;
+    API_CASE("api-case",
+            List.of(InternalUserView.ALL_DATA, InternalUserView.MY_FOLLOW, InternalUserView.MY_CREATE)),
+    API_MOCK("api-mock",
+            List.of(InternalUserView.ALL_DATA, InternalUserView.MY_CREATE)),
+    API_SCENARIO("api-scenario",
+            List.of(InternalUserView.ALL_DATA, InternalUserView.MY_FOLLOW, InternalUserView.MY_CREATE)),
+    BUG("bug",
+            List.of(InternalUserView.ALL_DATA, InternalUserView.MY_FOLLOW, InternalUserView.MY_CREATE));
+
 
     private String value;
     private List<InternalUserView> internalViews;