diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
index b183529c9f..d23450d08b 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
@@ -624,6 +624,11 @@
AND api_definition.protocol = #{request.protocol}
+
+
+ and (api_definition.status is null or api_definition.status != #{request.notEqStatus})
+
+
AND api_definition.id = #{request.id}
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
index 08188d2150..9756080b7b 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
@@ -183,6 +183,11 @@
or api_scenario.num like CONCAT('%', #{request.name},'%')
or api_scenario.custom_num like CONCAT('%', #{request.name},'%'))
+
+
+ and (api_scenario.status is null or api_scenario.status != #{request.notEqStatus})
+
+
AND project.workspace_id = #{request.workspaceId}
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index 5d76be7f82..9298dde217 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -355,6 +355,10 @@
and (test_case.status is null or test_case.status != #{request.statusIsNot})
+
+
+ and (test_case.status is null or test_case.status != #{request.notEqStatus})
+
and (test_case.name like CONCAT('%', #{request.name},'%')
or test_case.num like CONCAT('%', #{request.name},'%')
diff --git a/backend/src/main/java/io/metersphere/controller/request/BaseQueryRequest.java b/backend/src/main/java/io/metersphere/controller/request/BaseQueryRequest.java
index 1b958489c1..3d6562ec28 100644
--- a/backend/src/main/java/io/metersphere/controller/request/BaseQueryRequest.java
+++ b/backend/src/main/java/io/metersphere/controller/request/BaseQueryRequest.java
@@ -14,6 +14,11 @@ public class BaseQueryRequest {
private String name;
+ /**
+ * 状态不等于 notEqStatus
+ */
+ private String notEqStatus;
+
private String workspaceId;
private List ids;
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index ec08189a4f..a58811e4dc 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit ec08189a4f2c3aebf0688f4b9798af2993002d25
+Subproject commit a58811e4dc08813267cdece3e0c24ab1136475fd
diff --git a/frontend/src/business/components/common/chart/MsChart.vue b/frontend/src/business/components/common/chart/MsChart.vue
index 627a1ec7fa..fdf05f5c33 100644
--- a/frontend/src/business/components/common/chart/MsChart.vue
+++ b/frontend/src/business/components/common/chart/MsChart.vue
@@ -1,6 +1,6 @@
-
-
+
+
+
+
+
+
+
+