diff --git a/framework/sdk-parent/frontend/src/components/MsDialogHeader.vue b/framework/sdk-parent/frontend/src/components/MsDialogHeader.vue
index a7dfaf3eb3..a623321c7d 100644
--- a/framework/sdk-parent/frontend/src/components/MsDialogHeader.vue
+++ b/framework/sdk-parent/frontend/src/components/MsDialogHeader.vue
@@ -9,7 +9,7 @@
       </div>
       <div class="ms_btn">
         <el-button v-if="enableCancel" @click="cancel" :size="btnSize">{{ $t('commons.cancel') }}</el-button>
-        <el-button type="primary" @click="confirm" @keydown.enter.native.prevent :size="btnSize">
+        <el-button type="primary" @click="confirm" @keydown.enter.native.prevent v-prevent-re-click :size="btnSize">
           {{ $t('commons.confirm') }}
         </el-button>
       </div>
diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml
index 93a3335884..1b26d4e3d8 100644
--- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml
+++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml
@@ -394,11 +394,13 @@
     </select>
 
     <select id="get" resultType="io.metersphere.dto.TestReviewCaseDTO">
-        select test_case.remark, test_case_review_test_case.*, test_case.*, test_case_node.name as model, project.name as projectName
+        select test_case_review_test_case.id id, test_case_review_test_case.case_id caseId,
+               test_case.remark, test_case.review_status reviewStatus, test_case.status status, test_case.*,
+               test_case_review_test_case.*, test_case_node.name as model, project.name as projectName
         from test_case_review_test_case
-        inner join test_case on test_case_review_test_case.case_id = test_case.id
-        left join test_case_node on test_case_node.id=test_case.node_id
-        inner join project on project.id = test_case.project_id
+                 inner join test_case on test_case_review_test_case.case_id = test_case.id
+                 left join test_case_node on test_case_node.id=test_case.node_id
+                 inner join project on project.id = test_case.project_id
         where test_case_review_test_case.id = #{id}
     </select>
 
diff --git a/test-track/frontend/src/api/testCase.js b/test-track/frontend/src/api/testCase.js
index 23b49c4956..f5c7a7fd40 100644
--- a/test-track/frontend/src/api/testCase.js
+++ b/test-track/frontend/src/api/testCase.js
@@ -152,13 +152,9 @@ export function getReviewCasesForMinder(request, callback) {
 }
 
 export function getRelateTest(caseId) {
-  if (caseId) {
-    return get('/test/case/relate/test/list/' + caseId);
-  }
-  return {};
+  return get('/test/case/relate/test/list/' + caseId);
 }
 
-
 export function deleteRelateTest(caseId, testId) {
   return get('/test/case/relate/delete/' + caseId + '/' + testId);
 }
diff --git a/test-track/frontend/src/business/case/components/TestCaseEdit.vue b/test-track/frontend/src/business/case/components/TestCaseEdit.vue
index 859c128160..78b63c30ae 100644
--- a/test-track/frontend/src/business/case/components/TestCaseEdit.vue
+++ b/test-track/frontend/src/business/case/components/TestCaseEdit.vue
@@ -622,6 +622,9 @@ export default {
           this.operationType = 'add';
           this.copyCaseId = testCase.copyId;
           this.setFormData(testCase);
+          this.testCaseTemplate.customFields.forEach(item => {
+            item.isEdit = false;
+          });
           this.setTestCaseExtInfo(testCase);
           this.getSelectOptions();
           this.reload();
diff --git a/test-track/frontend/src/business/case/components/TestCaseList.vue b/test-track/frontend/src/business/case/components/TestCaseList.vue
index cc15f21e1f..2253c4cb59 100644
--- a/test-track/frontend/src/business/case/components/TestCaseList.vue
+++ b/test-track/frontend/src/business/case/components/TestCaseList.vue
@@ -477,6 +477,10 @@ export default {
         if (ids) {
           this.condition.ids = ids;
         }
+        let dataSelectRange = this.$route.params.dataSelectRange;
+        if (!dataSelectRange) {
+          delete this.condition.filters.review_status
+        }
         this.initTableData();
         this.condition.ids = null;
         this.getVersionOptions();
@@ -670,9 +674,6 @@ export default {
       this.condition.selectThisWeedRelevanceData = false;
       this.condition.caseCoverage = null;
       this.condition.filters.reviewStatus = ["Prepare", "Pass", "UnPass"];
-      if (!this.selectDataRange) {
-        delete this.condition.filters.review_status
-      }
       switch (this.selectDataRange) {
         case 'thisWeekCount':
           this.condition.selectThisWeedData = true;
diff --git a/test-track/frontend/src/business/case/components/TestCaseTestRelate.vue b/test-track/frontend/src/business/case/components/TestCaseTestRelate.vue
index d4f21f0332..8cd64bbe27 100644
--- a/test-track/frontend/src/business/case/components/TestCaseTestRelate.vue
+++ b/test-track/frontend/src/business/case/components/TestCaseTestRelate.vue
@@ -132,11 +132,13 @@ export default {
         });
     },
     initTable() {
-      getRelateTest(this.caseId)
-        .then((response) => {
-          this.data = response.data;
-          this.notInIds = this.data.map(i => i.testId);
-        });
+      if (this.caseId) {
+        getRelateTest(this.caseId)
+          .then((response) => {
+            this.data = response.data;
+            this.notInIds = this.data.map(i => i.testId);
+          });
+      }
     },
   }
 }
diff --git a/test-track/frontend/src/business/review/view/components/TestReviewTestCaseEdit.vue b/test-track/frontend/src/business/review/view/components/TestReviewTestCaseEdit.vue
index 3cee458d79..72f55e5e0b 100644
--- a/test-track/frontend/src/business/review/view/components/TestReviewTestCaseEdit.vue
+++ b/test-track/frontend/src/business/review/view/components/TestReviewTestCaseEdit.vue
@@ -385,7 +385,7 @@ export default {
           parseCustomField(item, this.testCaseTemplate, null, buildTestCaseOldFields(item));
           this.isCustomFiledActive = true;
           this.testCase = item;
-          this.oldReviewStatus = this.testCase.status;
+          this.oldReviewStatus = this.testCase.reviewStatus;
           if (!this.testCase.actualResult) {
             // 如果没值,使用模板的默认值
             this.testCase.actualResult = this.testCaseTemplate.actualResult;
@@ -404,7 +404,7 @@ export default {
     openTestCaseEdit(testCase, tableData) {
       this.showDialog = true;
       // 一开始加载时候需要保存用例评审旧的状态
-      this.oldReviewStatus = testCase.status;
+      this.oldReviewStatus = testCase.reviewStatus;
       this.activeTab = 'detail';
       this.hasTapdId = false;
       this.hasZentaoId = false;