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

🍒 fix(Dict): 修复枚举校验异常问题

Browse Source
This commit is contained in:
喵你个汪呀 2025-08-31 21:34:41 +08:00
parent b9787194a9
commit e849e9865f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Admin.NET/Admin.NET.Core/Attribute/DictAttribute.cs
View File

@ -54,8 +54,7 @@ public class DictAttribute : ValidationAttribute, ITransient
private async Task<ValidationResult> IsValidAsync(object? value, ValidationContext validationContext, CancellationToken cancellation) private async Task<ValidationResult> IsValidAsync(object? value, ValidationContext validationContext, CancellationToken cancellation)
{ {
// 1. 空值检查 // 1. 空值检查
if (IsEmpty(value)) if (IsEmpty(value)) return ValidationResult.Success;
return ValidationResult.Success;
// 2. 获取属性类型 // 2. 获取属性类型
var property = validationContext.ObjectType.GetProperty(validationContext.MemberName!); var property = validationContext.ObjectType.GetProperty(validationContext.MemberName!);
@ -81,7 +80,7 @@ public class DictAttribute : ValidationAttribute, ITransient
// 6. 单选校验 // 6. 单选校验
if (!Multiple) if (!Multiple)
{ {
var valStr = value?.ToString(); var valStr = value!.GetType().IsEnum ? value.ToInt().ToString() : value.ToString();
if (string.IsNullOrEmpty(valStr) || !dictHashSet.Contains(valStr)) if (string.IsNullOrEmpty(valStr) || !dictHashSet.Contains(valStr))
{ {
return new ValidationResult($"提示：{ErrorMessage}|字典【{DictTypeCode}】不包含【{value}】！"); return new ValidationResult($"提示：{ErrorMessage}|字典【{DictTypeCode}】不包含【{value}】！");
@ -108,7 +107,7 @@ public class DictAttribute : ValidationAttribute, ITransient
{ {
foreach (var item in listValue) foreach (var item in listValue)
{ {
var itemStr = item?.ToString(); var itemStr = item.GetType().IsEnum ? item.ToInt().ToString() : item.ToString();
if (string.IsNullOrEmpty(itemStr) || !dictHashSet.Contains(itemStr)) if (string.IsNullOrEmpty(itemStr) || !dictHashSet.Contains(itemStr))
{ {
return new ValidationResult($"提示：{ErrorMessage}|字典【{DictTypeCode}】不包含【{item}】！"); return new ValidationResult($"提示：{ErrorMessage}|字典【{DictTypeCode}】不包含【{item}】！");