diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/ExportAndImport/ClosedXmlExportImportService.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/ExportAndImport/ClosedXmlExportImportService.cs index 13a6e3008..26fd511e7 100644 --- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/ExportAndImport/ClosedXmlExportImportService.cs +++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/ExportAndImport/ClosedXmlExportImportService.cs @@ -233,7 +233,6 @@ public class ClosedXmlExportImportService : IExportImportService if (property != null) { var propertyType = property.PropertyType; - if (value.ToString() != "") { if (propertyType.IsEnum) @@ -264,22 +263,25 @@ public class ClosedXmlExportImportService : IExportImportService } else { - if (propertyType.IsEnum || propertyType.Name == nameof(Boolean) || propertyType.IsValueType) + if (propertyType.IsNullableType() == false) { - /* - * 枚举、bool、值类型验证 Required 标注 - * 框架中 Required 标注验证的是不为 NULL,非可空类型无法通过框架方法验证 - */ - var isHasRequiredAttribute = property.HasAttribute(); - if (isHasRequiredAttribute == true) + if (propertyType.IsEnum || propertyType.Name == nameof(Boolean) || propertyType.IsValueType) { - var requiredAttribute = property.GetCustomAttribute(); - var displayName = property.GetCustomAttribute()?.Name ?? headerName; - string errorMessage = string.Format(requiredAttribute.ErrorMessage, displayName); - validationRresults.Add(new ValidationResult(errorMessage, new string[] { "错误" })); + /* + * 枚举、bool、值类型验证 Required 标注 + * 框架中 Required 标注验证不为 NULL,非可空类型必填项无法通过框架方法验证 + */ + var isHasRequiredAttribute = property.HasAttribute(); + if (isHasRequiredAttribute == true) + { + var requiredAttribute = property.GetCustomAttribute(); + var displayName = property.GetCustomAttribute()?.Name ?? headerName; + string errorMessage = string.Format(requiredAttribute.ErrorMessage, displayName); + validationRresults.Add(new ValidationResult(errorMessage, new string[] { "错误" })); + } } } - } + } } } result.Add(model, validationRresults);