diff --git a/WebRoot/upload/1F5AB0D8-9867-421C-9BF4-C9A206F5375C.xlsx b/WebRoot/upload/1F5AB0D8-9867-421C-9BF4-C9A206F5375C.xlsx new file mode 100644 index 00000000..5c44660f Binary files /dev/null and b/WebRoot/upload/1F5AB0D8-9867-421C-9BF4-C9A206F5375C.xlsx differ diff --git a/WebRoot/upload/FE33F30E-3844-406B-84BA-D811064AD836.xlsx b/WebRoot/upload/FE33F30E-3844-406B-84BA-D811064AD836.xlsx new file mode 100644 index 00000000..0f1f3e1d Binary files /dev/null and b/WebRoot/upload/FE33F30E-3844-406B-84BA-D811064AD836.xlsx differ diff --git a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java index 6800af32..ce097ee5 100644 --- 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)) {