xiang.li
/
luban
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

【调整】可空bean的标识串由{null}改成null

main
walon 2021-06-30 09:33:31 +08:00
parent 059d3ffb09
commit 02a7973f42
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
config/Datas/test/test_null.xlsx
View File

Binary file not shown.

2
src/Luban.Job.Cfg/Source/DataCreators/ExcelDataCreator.cs
View File

@ -354,7 +354,7 @@ namespace Luban.Job.Cfg.DataCreators
} }
else if (subType != DefBean.BEAN_NOT_NULL_STR) else if (subType != DefBean.BEAN_NOT_NULL_STR)
{ {
throw new Exception($"type:{type.Bean.FullName} 可空标识 不合法（只能为{DefBean.BEAN_NOT_NULL_STR}或{DefBean.BEAN_NULL_STR})"); throw new Exception($"type:{type.Bean.FullName} 可空标识:{subType} 不合法（只能为{DefBean.BEAN_NOT_NULL_STR}或{DefBean.BEAN_NULL_STR})");
} }
} }
return new DBean(originBean, originBean, CreateBeanFields(originBean, x, ass)); return new DBean(originBean, originBean, CreateBeanFields(originBean, x, ass));

2
src/Luban.Job.Cfg/Source/DataCreators/ExcelNamedRowDataCreator.cs
View File

@ -210,7 +210,7 @@ namespace Luban.Job.Cfg.DataCreators
} }
else if (subType != DefBean.BEAN_NOT_NULL_STR) else if (subType != DefBean.BEAN_NOT_NULL_STR)
{ {
throw new Exception($"type:{type.Bean.FullName} {DefBean.TYPE_NAME_KEY} 不合法（只能为{DefBean.BEAN_NOT_NULL_STR}或{DefBean.BEAN_NULL_STR})"); throw new Exception($"type:{type.Bean.FullName} {DefBean.TYPE_NAME_KEY}:{subType} 不合法（只能为{DefBean.BEAN_NOT_NULL_STR}或{DefBean.BEAN_NULL_STR})");
} }
} }

2
src/Luban.Job.Cfg/Source/Defs/DefBean.cs
View File

@ -12,7 +12,7 @@ namespace Luban.Job.Cfg.Defs
{ {
public const string TYPE_NAME_KEY = "__type__"; public const string TYPE_NAME_KEY = "__type__";
public const string BEAN_NULL_STR = "{null}"; public const string BEAN_NULL_STR = "null";
public const string BEAN_NOT_NULL_STR = "{}"; public const string BEAN_NOT_NULL_STR = "{}";