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 2f1dfb51f4..b995da123e 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
@@ -357,15 +357,17 @@
     </sql>
 
     <sql id="queryVersionCondition">
-        <if test="request.versionId != null">
-            and ${versionTable}.version_id = #{request.versionId}
-        </if>
-        <if test="request.refId != null">
-            and ${versionTable}.ref_id = #{request.refId}
-        </if>
-        <if test="request.versionId == null and request.refId == null">
-            and ${versionTable}.latest = 1
-        </if>
+        <choose>
+            <when test="request.versionId != null and request.versionId != ''">
+                and ${versionTable}.version_id = #{request.versionId}
+            </when>
+            <when test="request.refId != null and request.refId != ''">
+                and ${versionTable}.ref_id = #{request.refId}
+            </when>
+            <otherwise>
+                and ${versionTable}.latest = 1
+            </otherwise>
+        </choose>
     </sql>
 
     <sql id="queryAssociationCase">
diff --git a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewControllerTests.java b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewControllerTests.java
index 3b0b12ddc8..013e055b6f 100644
--- a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewControllerTests.java
+++ b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewControllerTests.java
@@ -74,6 +74,8 @@ public class CaseReviewControllerTests extends BaseTest {
     private CaseReviewFunctionalCaseMapper caseReviewFunctionalCaseMapper;
     @Resource
     private CaseReviewFunctionalCaseUserMapper caseReviewFunctionalCaseUserMapper;
+    @Resource
+    private FunctionalCaseMapper functionalCaseMapper;
 
     @Test
     @Order(1)
@@ -106,6 +108,25 @@ public class CaseReviewControllerTests extends BaseTest {
         List<String> list = caseReviews.stream().map(CaseReview::getId).distinct().toList();
         Assertions.assertEquals(2, list.size());
 
+        caseReviewRequest = getCaseReviewAddRequest("创建评审X", CaseReviewPassRule.SINGLE.toString(), "CASE_REVIEW_TEST_GYQ_ID", false, true, null);
+        BaseAssociateCaseRequest baseAssociateCaseRequest = caseReviewRequest.getBaseAssociateCaseRequest();
+        baseAssociateCaseRequest.setSelectAll(true);
+        caseReviewRequest.setBaseAssociateCaseRequest(baseAssociateCaseRequest);
+        mvcResult1 = this.requestPostWithOkAndReturn(ADD_CASE_REVIEW, caseReviewRequest);
+        caseReview1 = getResultData(mvcResult1, CaseReview.class);
+        checkLog(caseReview1.getId(), OperationLogType.ADD);
+        caseReviews = getCaseReviews("创建评审X");
+        Assertions.assertEquals(1, caseReviews.size());
+         list = caseReviews.stream().map(CaseReview::getId).distinct().toList();
+        Assertions.assertEquals(1, list.size());
+        caseReviewFunctionalCaseExample = new CaseReviewFunctionalCaseExample();
+        caseReviewFunctionalCaseExample.createCriteria().andReviewIdEqualTo(caseReviews.get(0).getId());
+        caseReviewFunctionalCases = caseReviewFunctionalCaseMapper.selectByExample(caseReviewFunctionalCaseExample);
+        FunctionalCaseExample functionalCaseExample = new FunctionalCaseExample();
+        functionalCaseExample.createCriteria().andProjectIdEqualTo(baseAssociateCaseRequest.getProjectId());
+        List<FunctionalCase> functionalCases = functionalCaseMapper.selectByExample(functionalCaseExample);
+        Assertions.assertEquals(functionalCases.size(), caseReviewFunctionalCases.size());
+
     }
 
     private List<CaseReview> getCaseReviews(String name) {