From d425a43cd0523b47cbdd9a1954234708d97916e8 Mon Sep 17 00:00:00 2001
From: MeterSphere Bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Wed, 21 Sep 2022 16:40:00 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=94=A8=E4=BE=8B=E7=BC=BA=E5=B0=91=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#18127)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1017067 --user=宋昌昌 【测试跟踪】github#18013，excel导入13条功能用例，只导入了8条 https://www.tapd.cn/55049933/s/1248430

Co-authored-by: song-cc-rock <changchang.song@fit2cloud.com>
---
 .../metersphere/excel/listener/TestCaseNoModelDataListener.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a60b301a4b..13392ddacc 100644
--- a/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java
+++ b/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java
@@ -259,7 +259,7 @@ public class TestCaseNoModelDataListener extends AnalysisEventListener<Map<Integ
                         }
                     }
                     // 如果合并单元格的最后一个单元格，标记下
-                    if (rowIndex == mergeInfo.getLastRowIndex()) {
+                    if (rowIndex.equals(mergeInfo.getLastRowIndex())) {
                         // 根据名称列是否是合并单元格判断是不是同一条用例
                         if (getNameColIndex().equals(col)) {
                             this.isMergeLastRow = true;