From a5113a829c05fd342a9bd2a3baccc7432ee7e832 Mon Sep 17 00:00:00 2001
From: Guo XIn <371864209@qq.com>
Date: Mon, 24 Jul 2023 16:52:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=BB=BC=E5=90=88?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=9B=A0=E6=95=B0=E6=8D=AE=E8=A1=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=8C=85=E5=90=ABnull=E5=80=BC=E6=97=B6=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E5=90=8E=E5=8F=B0=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../browser/service/ExportComponent.java        | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/shandan-browser/src/main/java/com/keyware/shandan/browser/service/ExportComponent.java b/shandan-browser/src/main/java/com/keyware/shandan/browser/service/ExportComponent.java
index 81272d5..c651e87 100644
--- a/shandan-browser/src/main/java/com/keyware/shandan/browser/service/ExportComponent.java
+++ b/shandan-browser/src/main/java/com/keyware/shandan/browser/service/ExportComponent.java
@@ -21,14 +21,12 @@ import com.keyware.shandan.system.service.SysFileService;
 import com.keyware.shandan.system.utils.SysSettingUtil;
 import lombok.AllArgsConstructor;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 public class ExportComponent {
     private final String exportId;
@@ -107,9 +105,8 @@ public class ExportComponent {
             JSONObject col = (JSONObject) json;
             String comment = col.getString("comment");
             String colName = col.getString("columnName");
-            String name = StringUtils.hasTextByDefault(comment, colName);
             colNameList.add(colName);
-            return name;
+            return colName + (StringUtils.hasText(comment) ? "[" + comment + "]" : "");
         }).toList();
 
         // 添加第一行
@@ -118,7 +115,13 @@ public class ExportComponent {
         // 遍历数据
         datas.forEach(data -> {
             // 遍历字段列名，获取对应数据并拼接成列的集合
-            List<String> cells = StreamUtil.as(colNameList).map(col -> data.get(col).toString()).toList();
+            List<String> cells = colNameList.stream().map(col -> {
+                Object value = data.get(col);
+                if (value == null) {
+                    return "";
+                }
+                return String.valueOf(value);
+            }).collect(Collectors.toList());
             rowList.add(cells);
         });
 
@@ -189,7 +192,7 @@ public class ExportComponent {
 
     private void delete(String path) {
         File file = new File(path);
-        if(file.exists()){
+        if (file.exists()) {
             file.delete();
         }
     }