From 6d9a581da67bf0eb4388395b81d47c349260922b Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Fri, 29 Nov 2024 14:56:59 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86):?=
 =?UTF-8?q?=20=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E6=9C=89=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E7=9A=84=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/i18n/dashboard.properties  |  2 +-
 .../resources/i18n/dashboard_zh_CN.properties |  2 +-
 .../mapper/ExtFunctionalCaseMapper.xml        | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/backend/framework/sdk/src/main/resources/i18n/dashboard.properties b/backend/framework/sdk/src/main/resources/i18n/dashboard.properties
index 36cf609dd7..81d2c984c3 100644
--- a/backend/framework/sdk/src/main/resources/i18n/dashboard.properties
+++ b/backend/framework/sdk/src/main/resources/i18n/dashboard.properties
@@ -4,7 +4,7 @@ functional_case.hasReview=已评审
 functional_case.unReview=未评审
 functional_case.passRate=通过率
 functional_case.hasPass=已通过
-functional_case.unPass=不通过
+functional_case.unPass=未通过
 functional_case.associateRate=关联率
 functional_case.hasAssociate=已关联
 functional_case.unAssociate=未关联
diff --git a/backend/framework/sdk/src/main/resources/i18n/dashboard_zh_CN.properties b/backend/framework/sdk/src/main/resources/i18n/dashboard_zh_CN.properties
index 17c1f553fd..2fc674e5ac 100644
--- a/backend/framework/sdk/src/main/resources/i18n/dashboard_zh_CN.properties
+++ b/backend/framework/sdk/src/main/resources/i18n/dashboard_zh_CN.properties
@@ -4,7 +4,7 @@ functional_case.hasReview=已评审
 functional_case.unReview=未评审
 functional_case.passRate=通过率
 functional_case.hasPass=已通过
-functional_case.unPass=不通过
+functional_case.unPass=未通过
 functional_case.associateRate=关联率
 functional_case.hasAssociate=已关联
 functional_case.unAssociate=未关联
diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
index 28ccf01ed0..f33db52b3b 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
@@ -275,6 +275,25 @@
                             and functional_case.delete_user in
                             <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
                         </when>
+                        <!-- 关联用例的 -->
+                        <when test="key=='associateCase'">
+                            <if test="values.contains('true')">
+                                and functional_case.id in (
+                                select
+                                distinct fct.case_id
+                                from functional_case_test fct
+                                LEFT JOIN functional_case fc ON fc.id = fct.case_id
+                                where fc.deleted = false )
+                            </if>
+                            <if test="values.contains('false')">
+                                and functional_case.id not in (
+                                select
+                                distinct fct.case_id
+                                from functional_case_test fct
+                                LEFT JOIN functional_case fc ON fc.id = fct.case_id
+                                where fc.deleted = false )
+                            </if>
+                        </when>
                     </choose>
                 </if>
             </foreach>