From 91cfb2991374576e083e170e68d47bc0dfc80a6e Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 25 May 2022 17:44:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AF=BC=E5=85=A5=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89id=E9=87=8D=E5=A4=8D=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E5=A4=A7=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1013375 --user=陈建星 【测试跟踪】GitHub#13815 功能用例，系统未对导入的用例判断ID大小写 https://www.tapd.cn/55049933/s/1163994
---
 .../excel/listener/TestCaseNoModelDataListener.java       | 4 ++--
 frontend/src/business/components/track/case/TestCase.vue  | 1 -
 .../components/track/case/components/TestCaseList.vue     | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java b/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java
index 0c9ba97148..d87b4fb1e0 100644
--- a/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java
+++ b/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java
@@ -165,14 +165,14 @@ public class TestCaseNoModelDataListener extends AnalysisEventListener<Map<Integ
                 String customId = data.getCustomNum();
                 if (StringUtils.isEmpty(customId)) {
                     stringBuilder.append(Translator.get("id_required") + ";");
-                } else if (customIds.contains(customId)) {
+                } else if (customIds.contains(customId.toLowerCase())) {
                     stringBuilder.append(Translator.get("id_repeat_in_table") + ";");
                 } else if (StringUtils.equals(FunctionCaseImportEnum.Create.name(), importType) && savedCustomIds.contains(customId)) {
                     stringBuilder.append(Translator.get("custom_num_is_exist") + ";");
                 } else if (StringUtils.equals(FunctionCaseImportEnum.Update.name(), importType) && !savedCustomIds.contains(customId)) {
                     stringBuilder.append(Translator.get("custom_num_is_not_exist") + ";");
                 } else {
-                    customIds.add(customId);
+                    customIds.add(customId.toLowerCase());
                 }
             }
         }
diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index d29507ee2b..48562d87a0 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -632,7 +632,6 @@ export default {
     },
     refreshAll() {
       this.$refs.nodeTree.list();
-      this.refresh();
     },
     openRecentTestCaseEditDialog(caseId) {
       if (caseId) {
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 6f8fb4e9f0..65249e3c65 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -961,7 +961,7 @@ export default {
     _handleDeleteToGc(testCase) {
       let testCaseId = testCase.id;
       this.$post('/test/case/deleteToGc/' + testCaseId, {}, () => {
-        this.$emit('refreshTable');
+        this.$emit('refreshAll');
         this.initTableData();
         this.$success(this.$t('commons.delete_success'));
       });
@@ -1126,13 +1126,13 @@ export default {
           this.$get('/test/case/deletePublic/' + testCase.versionId + '/' + testCase.refId, () => {
             this.$success(this.$t('commons.delete_success'));
             this.$refs.apiDeleteConfirm.close();
-            this.$emit("refreshTable");
+            this.$emit("refreshAll");
           });
         } else {
           this.$get('/test/case/delete/' + testCase.versionId + '/' + testCase.refId, () => {
             this.$success(this.$t('commons.delete_success'));
             this.$refs.apiDeleteConfirm.close();
-            this.$emit("refreshTable");
+            this.$emit("refreshAll");
           });
         }
       }
@@ -1144,7 +1144,7 @@ export default {
             this.$success(this.$t('commons.delete_success'));
             // this.initTable();
             this.$refs.apiDeleteConfirm.close();
-            this.$emit("refreshTable");
+            this.$emit("refreshAll");
 
           });
         } else {