From 6ce558951315835f88e6ec6040d66f302a0be1e4 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Tue, 29 Nov 2022 17:11:13 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=BA=E9=99=B7=E7=AE=A1=E7=90=86=E5=85=B3?=
 =?UTF-8?q?=E8=81=94Azure=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1020426 --user=宋昌昌 【测试跟踪】项目关联azure-缺陷管理-导入缺陷会报错 https://www.tapd.cn/55049933/s/1307773
---
 .../excel/listener/IssueExcelListener.java    | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/test-track/backend/src/main/java/io/metersphere/excel/listener/IssueExcelListener.java b/test-track/backend/src/main/java/io/metersphere/excel/listener/IssueExcelListener.java
index 3835df49e3..fab5a5822b 100644
--- a/test-track/backend/src/main/java/io/metersphere/excel/listener/IssueExcelListener.java
+++ b/test-track/backend/src/main/java/io/metersphere/excel/listener/IssueExcelListener.java
@@ -307,50 +307,64 @@ public class IssueExcelListener extends AnalysisEventListener<Map<Integer, Strin
                         if (StringUtils.equalsAnyIgnoreCase(type, CustomFieldType.MULTIPLE_MEMBER.getValue(),
                                 CustomFieldType.MULTIPLE_SELECT.getValue(), CustomFieldType.CHECKBOX.getValue(),
                                 CustomFieldType.CASCADING_SELECT.getValue())) {
-                            customFieldResourceDTO.setValue("[]");
                             customFieldItemDTO.setValue("[]");
-                        } else if (StringUtils.equalsAnyIgnoreCase(type, CustomFieldType.MULTIPLE_INPUT.getValue())) {
                             customFieldResourceDTO.setValue("[]");
+                        } else if (StringUtils.equalsAnyIgnoreCase(type, CustomFieldType.MULTIPLE_INPUT.getValue())) {
                             customFieldItemDTO.setValue(Collections.emptyList());
+                            customFieldResourceDTO.setValue("[]");
                         } else if (StringUtils.equalsAnyIgnoreCase(type, CustomFieldType.RADIO.getValue(),
                                 CustomFieldType.RICH_TEXT.getValue(), CustomFieldType.SELECT.getValue(),
                                 CustomFieldType.FLOAT.getValue(), CustomFieldType.DATE.getValue(),
                                 CustomFieldType.DATETIME.getValue(), CustomFieldType.INPUT.getValue())) {
-                            customFieldResourceDTO.setValue(StringUtils.EMPTY);
                             customFieldItemDTO.setValue(StringUtils.EMPTY);
+                            customFieldResourceDTO.setValue(StringUtils.EMPTY);
                         } else if (StringUtils.equalsAnyIgnoreCase(type, CustomFieldType.TEXTAREA.getValue())) {
                             customFieldItemDTO.setValue(StringUtils.EMPTY);
                         }
                     } else {
                         if (StringUtils.equalsAnyIgnoreCase(type,
                                 CustomFieldType.RICH_TEXT.getValue(), CustomFieldType.TEXTAREA.getValue())) {
+                            customFieldItemDTO.setValue(v.toString());
                             customFieldResourceDTO.setTextValue(v.toString());
                         } else if (StringUtils.equalsAnyIgnoreCase(type, CustomFieldType.FLOAT.getValue())) {
+                            customFieldItemDTO.setValue(Float.parseFloat(v.toString()));
                             customFieldResourceDTO.setValue(v.toString());
                         } else if (StringUtils.equalsAnyIgnoreCase(type, CustomFieldType.MULTIPLE_SELECT.getValue(),
                                 CustomFieldType.CHECKBOX.getValue())) {
                             if (!v.toString().contains("[")) {
                                 v = List.of("\"" + v + "\"");
                             }
+                            customFieldItemDTO.setValue(parseOptionText(customFieldDao.getOptions(), v.toString()));
                             customFieldResourceDTO.setValue(parseOptionText(customFieldDao.getOptions(), v.toString()));
                         } else if (StringUtils.equalsAnyIgnoreCase(type, CustomFieldType.SELECT.getValue(),
                                 CustomFieldType.RADIO.getValue())) {
+                            customFieldItemDTO.setValue(parseOptionText(customFieldDao.getOptions(), v.toString()));
                             customFieldResourceDTO.setValue("\"" + parseOptionText(customFieldDao.getOptions(), v.toString()) + "\"");
-                        } else if (StringUtils.equalsAnyIgnoreCase(type, CustomFieldType.MULTIPLE_INPUT.getValue(),
-                                CustomFieldType.MULTIPLE_MEMBER.getValue(), CustomFieldType.CASCADING_SELECT.getValue())) {
+                        } else if (StringUtils.equalsAnyIgnoreCase(type, CustomFieldType.MULTIPLE_INPUT.getValue())) {
                             if (!v.toString().contains("[")) {
                                 v = List.of("\"" + v + "\"");
                             }
+                            customFieldItemDTO.setValue(v);
+                            customFieldResourceDTO.setValue(v.toString());
+                        } else if (StringUtils.equalsAnyIgnoreCase(type, CustomFieldType.MULTIPLE_MEMBER.getValue(),
+                                CustomFieldType.CASCADING_SELECT.getValue())) {
+                            if (!v.toString().contains("[")) {
+                                v = List.of("\"" + v + "\"");
+                            }
+                            customFieldItemDTO.setValue(v.toString());
                             customFieldResourceDTO.setValue(v.toString());
                         } else if (StringUtils.equalsAnyIgnoreCase(type, CustomFieldType.DATE.getValue())) {
                             Date vdate = DateUtils.parseDate(v.toString(), "yyyy/MM/dd");
                             v = DateUtils.format(vdate, "yyyy-MM-dd");
+                            customFieldItemDTO.setValue(v.toString());
                             customFieldResourceDTO.setValue("\"" + v + "\"");
                         } else if (StringUtils.equalsAnyIgnoreCase(type, CustomFieldType.DATETIME.getValue())) {
                             Date vdate = DateUtils.parseDate(v.toString());
                             v =  DateUtils.format(vdate, "yyyy-MM-dd'T'HH:mm");
+                            customFieldItemDTO.setValue(v.toString());
                             customFieldResourceDTO.setValue("\"" + v + "\"");
                         } else {
+                            customFieldItemDTO.setValue(v.toString());
                             customFieldResourceDTO.setValue("\"" + v + "\"");
                         }
                     }
@@ -359,13 +373,6 @@ public class IssueExcelListener extends AnalysisEventListener<Map<Integer, Strin
                     } else {
                         editFields.add(customFieldResourceDTO);
                     }
-                    if (StringUtils.equalsAnyIgnoreCase(type, CustomFieldType.MULTIPLE_INPUT.getValue())) {
-                        customFieldItemDTO.setValue(v);
-                    } else if (StringUtils.equalsAnyIgnoreCase(type, CustomFieldType.FLOAT.getValue())) {
-                        customFieldItemDTO.setValue(StringUtils.isNotEmpty(v.toString()) ? Float.parseFloat(v.toString()) : StringUtils.EMPTY);
-                    } else {
-                        customFieldItemDTO.setValue(v.toString());
-                    }
                     requestFields.add(customFieldItemDTO);
                 }
             } catch (Exception e) {