From 91bb1b317f8a4d5af1d3bf353b35305b733d9f9e Mon Sep 17 00:00:00 2001 From: walon Date: Thu, 2 Dec 2021 17:11:49 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Dexcel=E4=B8=AD=E5=A4=9A=E5=B1=82=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E5=A4=B4=E8=AF=BB=E5=8F=96=E5=8F=AF=E7=A9=BAbean=E6=97=B6?= =?UTF-8?q?=E6=8A=9B=E5=BC=82=E5=B8=B8=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Luban.Job.Cfg/Source/DataCreators/SheetDataCreator.cs | 4 ++-- src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Luban.Job.Cfg/Source/DataCreators/SheetDataCreator.cs b/src/Luban.Job.Cfg/Source/DataCreators/SheetDataCreator.cs index 34f4e95..c0fbe29 100644 --- a/src/Luban.Job.Cfg/Source/DataCreators/SheetDataCreator.cs +++ b/src/Luban.Job.Cfg/Source/DataCreators/SheetDataCreator.cs @@ -351,8 +351,8 @@ namespace Luban.Job.Cfg.DataCreators { if (type.IsNullable) { - string subType = row.GetSubTitleNamedRow(DefBean.TYPE_NAME_KEY).Current.ToString().Trim(); - if (subType == DefBean.BEAN_NULL_STR) + string subType = row.GetSubTitleNamedRow(DefBean.TYPE_NAME_KEY).Current?.ToString()?.Trim(); + if (subType == null || subType == DefBean.BEAN_NULL_STR) { return null; } diff --git a/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs b/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs index aaf9990..76cea4d 100644 --- a/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs +++ b/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs @@ -770,7 +770,7 @@ namespace Luban.Job.Cfg.Defs return f; } - private static readonly List _beanOptinsAttrs = new List { "value_type", "alias", "sep", "comment", "tags", "group", "externaltype" }; + private static readonly List _beanOptinsAttrs = new List { "value_type", "alias", "sep", "comment", "tags", "externaltype" }; private static readonly List _beanRequireAttrs = new List { "name" }; override protected void AddBean(string defineFile, XElement e, string parent)