From a43e3a84a7615bd0aed4f918798b2999842315e7 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 23 Nov 2022 18:01:16 +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=85=BC=E5=AE=B9=E6=97=A7?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=9A=84=E8=B4=A3=E4=BB=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1020164 --user=陈建星 【测试跟踪】测试用例-导入旧模版用例-导入后责任人为空 https://www.tapd.cn/55049933/s/1303172
---
 .../excel/listener/TestCaseNoModelDataListener.java       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test-track/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java b/test-track/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java
index 459e5afbaf..1659b608c3 100644
--- a/test-track/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java
+++ b/test-track/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java
@@ -398,6 +398,10 @@ public class TestCaseNoModelDataListener extends AnalysisEventListener<Map<Integ
         Map<String, Object> customData = data.getCustomData();
         for (String fieldName : customData.keySet()) {
             Object value = customData.get(fieldName);
+            String originFieldName = fieldName;
+            if (TestCaseImportFiled.MAINTAINER.getFiledLangMap().containsValue(fieldName.replace("(ID)", StringUtils.EMPTY))) {
+                fieldName = fieldName.replace("(ID)", StringUtils.EMPTY); // 兼容旧模板的 责任人(ID)
+            }
             CustomFieldDao customField = customFieldsMap.get(fieldName);
             if (customField == null) {
                 continue;
@@ -407,7 +411,7 @@ public class TestCaseNoModelDataListener extends AnalysisEventListener<Map<Integ
                 customFieldValidator.validate(customField, value.toString());
                 if (customFieldValidator.isKVOption) {
                     // 这里如果填的是选项值，替换成选项ID，保存
-                    customData.put(fieldName, customFieldValidator.parse2Key(value.toString(), customField));
+                    customData.put(originFieldName, customFieldValidator.parse2Key(value.toString(), customField));
                 }
                 if (StringUtils.equalsAny(customField.getType(), CustomFieldType.TEXTAREA.getValue(), CustomFieldType.RICH_TEXT.getValue())) {
                     data.getTextFieldSet().add(fieldName);
@@ -420,7 +424,7 @@ public class TestCaseNoModelDataListener extends AnalysisEventListener<Map<Integ
             } else if (StringUtils.equals(fieldName, TestCaseImportFiled.PRIORITY.getFiledLangMap().get(Locale.SIMPLIFIED_CHINESE))) {
                 data.setPriority(customData.get(fieldName).toString());
             } else if (StringUtils.equals(fieldName, TestCaseImportFiled.MAINTAINER.getFiledLangMap().get(Locale.SIMPLIFIED_CHINESE))) {
-                data.setMaintainer(customData.get(fieldName).toString());
+                data.setMaintainer(customData.get(originFieldName).toString());
             }
         }
     }