gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '😃perf(特性):简化身份证特性校验代码' (#405) from ir0nmax/Admin.NET.Pro:v2 into v2

Browse Source 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/405
This commit is contained in:
zuohuaijun 2025-08-18 19:25:23 +08:00
commit 525253b866
1 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Admin.NET/Admin.NET.Core/Attribute/IdCardNoAttribute.cs
View File

@ -10,44 +10,22 @@ namespace Admin.NET.Core;
/// 身份证号码合规性校验特性 /// 身份证号码合规性校验特性
/// </summary> /// </summary>
[SuppressSniffer] [SuppressSniffer]
[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)] [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = true, Inherited = true)]
public class IdCardNoAttribute : ValidationAttribute public class IdCardNoAttribute : ValidationAttribute
{ {
/// <summary>
/// 是否允许空字符串
/// </summary>
[Obsolete("参数已废弃，逻辑已删除，请使用[Required]特性校验必填")]
public bool AllowEmptyStrings { get; set; } = false;
/// <summary>
/// 允许空值，有值才验证，默认 false
/// </summary>
[Obsolete("参数已废弃，逻辑已删除，请使用[Required]特性校验必填")]
public bool AllowNullValue { get; set; } = false;
protected override ValidationResult IsValid(object value, ValidationContext validationContext) protected override ValidationResult IsValid(object value, ValidationContext validationContext)
{ {
// 判断是否允许空值 // 检查目标类型是否为字符串
if (IsEmpty(value)) return ValidationResult.Success; if (value != null && value is not string)
return new ValidationResult($"{validationContext.DisplayName} 必须是字符串类型");
// 可空，或者通过验证
string idCardNo = value?.ToString(); string idCardNo = value?.ToString();
if (string.IsNullOrEmpty(idCardNo) || IdCardHelper.CheckIdCard(idCardNo))
if (!IdCardHelper.CheckIdCard(idCardNo)) {
return new ValidationResult($"身份证号格式不正确");
return ValidationResult.Success; return ValidationResult.Success;
} }
/// <summary> return new ValidationResult($"身份证号格式不正确");
/// 判断值是否为空（null、空字符串、空集合）
/// </summary>
private static bool IsEmpty(object? value)
{
return value switch
{
null => true,
string s => string.IsNullOrWhiteSpace(s),
IList list => list.Count == 0,
_ => false
};
} }
} }