diff --git a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs index 6ff8ab0e6..baa5a2a1a 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs @@ -6,7 +6,7 @@ namespace IRaCIS.Application.Contracts { - public class BasicDicView: AddOrEditBasicDic + public class BasicDicView : AddOrEditBasicDic { public DateTime CreateTime { get; set; } @@ -59,7 +59,7 @@ namespace IRaCIS.Application.Contracts public string ChildGroup { get; set; } = String.Empty; public int ChildCodeEnum { get; set; } - + public int ShowOrder { get; set; } @@ -78,6 +78,8 @@ namespace IRaCIS.Application.Contracts } + + public class BasicDicSelect { public Guid Id { get; set; } @@ -97,7 +99,7 @@ namespace IRaCIS.Application.Contracts public DicDataTypeEnum DataTypeEnum { get; set; } - public bool IsEnumInt => System.Text.RegularExpressions.Regex.IsMatch(Code, @"^\d*$") && DataTypeEnum== DicDataTypeEnum.Enum; + public bool IsEnumInt => System.Text.RegularExpressions.Regex.IsMatch(Code, @"^-?\d+$") && DataTypeEnum== DicDataTypeEnum.Enum; }