Merge branch 'main' of http://10.10.14.176:3000/huanghai/YunNanDsBase

8 months ago · 39ea0f3da9
parent dedadd93dc b567fd1e99
commit 39ea0f3da9
3 changed files with 2 additions and 2 deletions
--- a/WebRoot/upload/1F5AB0D8-9867-421C-9BF4-C9A206F5375C.xlsx
+++ b/WebRoot/upload/1F5AB0D8-9867-421C-9BF4-C9A206F5375C.xlsx
--- a/WebRoot/upload/FE33F30E-3844-406B-84BA-D811064AD836.xlsx
+++ b/WebRoot/upload/FE33F30E-3844-406B-84BA-D811064AD836.xlsx
--- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
+++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
@ -736,8 +736,8 @@ public class DataEaseModel {
                //第一行是表头
                String colName = listExcelRow.getFirst().getData().get(j);

-                if (StrKit.isBlank(value.trim()) && colName.equals("数值")) {
-                    record.set(colName, 0);
+                if (StrKit.isBlank(value.trim()) && colName.contains("数值")) {
+                    record.set(colName, null);
                } else if (isInteger(value)) {
                    record.set(colName, Integer.parseInt(value));
                } else if (isDouble(value)) {