From bdeabaf54b47f34ad442d1377624ba3260a34171 Mon Sep 17 00:00:00 2001
From: WangXu10 <xu.wang@fit2cloud.com>
Date: Wed, 22 May 2024 17:02:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91id=E5=AF=BC=E8=87=B4=E7=9A=84=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E8=AF=A6=E6=83=85=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1040831 --user=王旭 【测试计划】计划详情-用例详情-待执行用例列表-切换已执行用例失败 https://www.tapd.cn/55049933/s/1518559
---
 .../excel/listener/FunctionalCaseCheckEventListener.java     | 3 ++-
 .../excel/listener/FunctionalCaseImportEventListener.java    | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/excel/listener/FunctionalCaseCheckEventListener.java b/backend/services/case-management/src/main/java/io/metersphere/functional/excel/listener/FunctionalCaseCheckEventListener.java
index 7ac2640ce8..2b47511515 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/excel/listener/FunctionalCaseCheckEventListener.java
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/excel/listener/FunctionalCaseCheckEventListener.java
@@ -256,7 +256,8 @@ public class FunctionalCaseCheckEventListener extends AnalysisEventListener<Map<
         for (int i = 0; i < index; i++) {
             // 保持插入顺序，判断用例是否有相同的steps
             Map<String, Object> step = new LinkedHashMap<>();
-            step.put("num", startStepIndex + i + 1);
+            step.put("id", UUID.randomUUID().toString());
+            step.put("num", startStepIndex + i);
             if (i < stepDescList.size()) {
                 step.put("desc", stepDescList.get(i));
                 if (stepDescList.get(i).length() > STEP_LENGTH) {
diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/excel/listener/FunctionalCaseImportEventListener.java b/backend/services/case-management/src/main/java/io/metersphere/functional/excel/listener/FunctionalCaseImportEventListener.java
index a9a21e170a..0126cac935 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/excel/listener/FunctionalCaseImportEventListener.java
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/excel/listener/FunctionalCaseImportEventListener.java
@@ -282,6 +282,8 @@ public class FunctionalCaseImportEventListener extends AnalysisEventListener<Map
         } else {
             String steps = getSteps(functionalCaseExcelData);
             functionalCaseExcelData.setSteps(steps);
+            functionalCaseExcelData.setTextDescription(StringUtils.EMPTY);
+            functionalCaseExcelData.setExpectedResult(StringUtils.EMPTY);
         }
 
     }
@@ -321,7 +323,8 @@ public class FunctionalCaseImportEventListener extends AnalysisEventListener<Map
         for (int i = 0; i < index; i++) {
             // 保持插入顺序，判断用例是否有相同的steps
             Map<String, Object> step = new LinkedHashMap<>();
-            step.put("num", startStepIndex + i + 1);
+            step.put("id", UUID.randomUUID().toString());
+            step.put("num", startStepIndex + i );
             if (i < stepDescList.size()) {
                 step.put("desc", stepDescList.get(i));
             } else {