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 + + + + 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 ) + + + 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 ) + +