From dd582a37ee52c25df4f5b1a7e74154721bf09346 Mon Sep 17 00:00:00 2001 From: walon Date: Mon, 25 Oct 2021 16:44:23 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E5=AF=B9?= =?UTF-8?q?=E4=BA=8E=E6=9C=89=E6=A0=87=E9=A2=98=E5=A4=B4=E9=99=90=E5=AE=9A?= =?UTF-8?q?=E7=9A=84=E5=8F=AF=E7=A9=BAbean=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=89=80=E6=9C=89=E5=8D=95=E5=85=83=E6=A0=BC=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=EF=BC=8C=E5=88=99=E5=8F=96null=EF=BC=88=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E5=BC=BA=E5=88=B6=E8=A6=81=E6=B1=82=E5=A1=ABnull=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Luban.Job.Cfg/Source/DataCreators/SheetDataCreator.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Luban.Job.Cfg/Source/DataCreators/SheetDataCreator.cs b/src/Luban.Job.Cfg/Source/DataCreators/SheetDataCreator.cs index 802543f..84fafc2 100644 --- a/src/Luban.Job.Cfg/Source/DataCreators/SheetDataCreator.cs +++ b/src/Luban.Job.Cfg/Source/DataCreators/SheetDataCreator.cs @@ -310,11 +310,19 @@ namespace Luban.Job.Cfg.DataCreators if (row.Row != null) { var s = row.AsStream(""); + if (type.IsNullable && s.TryReadEOF()) + { + return null; + } return type.Apply(ExcelStreamDataCreator.Ins, s); } else if (row.Rows != null) { var s = row.AsMultiRowConcatStream(""); + if (type.IsNullable && s.TryReadEOF()) + { + return null; + } return type.Apply(ExcelStreamDataCreator.Ins, s); } else if (row.Fields != null)