From b84b56b6a5199c647cad3c5eb4ae5ba38b3c3955 Mon Sep 17 00:00:00 2001
From: AnAngle <1323481023@qq.com>
Date: Sun, 24 Jul 2022 00:32:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E5=AF=BC=E5=85=A5=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=8D=E5=AF=B9=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1015226 --user=陈建星 【测试跟踪】导入功能用例，上传错误格式的xlsx文件，报错“java.lang.NullPointerException” https://www.tapd.cn/55049933/s/1208306
---
 .../excel/listener/TestCaseNoModelDataListener.java           | 4 +++-
 1 file changed, 3 insertions(+), 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 7d83ed2a24..393fedb216 100644
--- a/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java
+++ b/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java
@@ -122,7 +122,9 @@ public class TestCaseNoModelDataListener extends AnalysisEventListener<Map<Integ
             //根据excel数据实体中的javax.validation + 正则表达式来校验excel数据
             errMsg = ExcelValidateHelper.validateEntity(testCaseExcelData);
             //自定义校验规则
-            errMsg = validate(testCaseExcelData, errMsg);
+            if (StringUtils.isEmpty(errMsg)) {
+                errMsg = validate(testCaseExcelData, errMsg);
+            }
         } catch (NoSuchFieldException e) {
             errMsg = Translator.get("parse_data_error");
             LogUtil.error(e.getMessage(), e);