From 9f51920c55fda1d275f439d175129b76cdab5a05 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 31 Aug 2021 12:49:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8A=BD=E5=8F=96excel=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/dataset/ExtractDataService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 7b86ae2968..df86334a8f 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -1129,7 +1129,7 @@ public class ExtractDataService { " get(Fields.Out, filed).setValue(r, 0);\n" + " get(Fields.Out, filed).getValueMeta().setType(2);\n" + " }\n" + - " }\n"; + " }\n" ; private final static String handleExcelIntColumn = " \t\tif(tmp != null && tmp.endsWith(\".0\")){\n" + " try {\n" + @@ -1144,7 +1144,11 @@ public class ExtractDataService { " tmp = tmp.replaceAll(\"\\r\",\" \");\n" + " tmp = tmp.replaceAll(\"\\n\",\" \");\n" + " get(Fields.Out, filed).setValue(r, tmp);\n" + - " } "; + " } \n" + + "\t\tif(tmp == null){\n" + + " \t\t\ttmp = \"\";\n" + + "\t\t\tget(Fields.Out, filed).setValue(r, tmp);\n" + + "\t\t}"; private final static String code = "import org.pentaho.di.core.row.ValueMetaInterface;\n" + "import java.util.List;\n" +