diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
index 1da15e66de..eb15788b39 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
@@ -7,6 +7,10 @@
         from issues
         inner join test_case_issues
         on test_case_issues.issues_id = issues.id
+        <if test="request.projectId != null||request.workspaceId != null">
+            left join
+            project on issues.project_id = project.id
+        </if>
         <include refid="queryWhereCondition"/>
         and (issues.platform_status != 'delete' or issues.platform_status is NULL)
         <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
@@ -42,6 +46,10 @@
         from issues
         left join
         test_case_issues on issues.id = test_case_issues.issues_id
+        <if test="request.projectId != null||request.workspaceId != null">
+            left join
+            project on issues.project_id = project.id
+        </if>
         <include refid="queryWhereCondition"/>
         and (test_case_issues.test_case_id is null or test_case_issues.test_case_id != #{request.caseId})
         and (issues.platform_status != 'delete' or issues.platform_status is NULL)
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
index 09bc003488..19abbaf8d4 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
@@ -176,18 +176,17 @@
                                         </foreach>
                                     </otherwise>
                                 </choose>
-                                <if test="request.byFilter == true">
-                                    and test_plan.status in
-                                    <foreach collection="values" item="value" separator="," open="(" close=")">
-                                        #{value}
-                                    </foreach>
-                                </if>
                             </when>
                         </choose>
                     </if>
                 </foreach>
             </if>
-
+            <if test="request.byFilter == true">
+                and test_plan.status in
+                <foreach collection="request.filterStatus" item="value" separator="," open="(" close=")">
+                    #{value}
+                </foreach>
+            </if>
         </where>
 
         <if test="request.orders != null and request.orders.size() > 0">
diff --git a/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestPlanRequest.java b/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestPlanRequest.java
index d8dd691772..ca9f263637 100644
--- a/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestPlanRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestPlanRequest.java
@@ -41,4 +41,6 @@ public class QueryTestPlanRequest extends TestPlan {
      * 是否通过筛选条件查询（这个字段针对我的工作台-页面列表上的筛选做特殊处理）
      */
     private boolean byFilter;
+
+    private List<String> filterStatus;
 }