Update Discrimator

This commit is contained in:
sunkaixuan
2023-07-19 23:37:58 +08:00
parent c05aba0e3b
commit 01317cdeb5
3 changed files with 23 additions and 2 deletions

View File

@@ -379,16 +379,18 @@ namespace SqlSugar
this.ClearFilter(typeof(FilterType1), typeof(FilterType2),typeof(FilterType3));
return this;
}
public ISugarQueryable<T> Filter(Type type)
public ISugarQueryable<T> Filter(Type type)
{
this.Context.InitMappingInfo(type);
var whereString= QueryBuilder.GetFilters(type);
if (whereString.HasValue())
if (whereString.HasValue())
{
this.Where(whereString);
}
UtilMethods.AddDiscrimator(type,this);
return this;
}
public virtual ISugarQueryable<T> Mapper(Action<T> mapperAction)
{
this.MapperAction=UtilMethods.IsNullReturnNew(this.MapperAction);

View File

@@ -127,6 +127,7 @@ namespace SqlSugar
InitMappingInfo<T>();
var result = this.CreateQueryable<T>();
UtilMethods.AddDiscrimator(typeof(T), result);
return result;
}
/// <summary>

View File

@@ -1265,5 +1265,23 @@ namespace SqlSugar
var method = value.GetType().GetMethods().First(it => it.GetParameters().Length == 0 && it.Name == "ToShortDateString");
return method.Invoke(value, new object[] { });
}
internal static void AddDiscrimator<T>(Type type, ISugarQueryable<T> queryable)
{
var entityInfo = queryable.Context?.EntityMaintenance?.GetEntityInfoWithAttr(type);
if (entityInfo!=null&&entityInfo.Discrimator.HasValue())
{
Check.ExceptionEasy(!Regex.IsMatch(entityInfo.Discrimator, @"^(?:\w+:\w+)(?:,\w+:\w+)*$"), "The format should be type:cat for this type, and if there are multiple, it can be FieldName:cat,FieldName2:dog ", "格式错误应该是type:cat这种格式如果是多个可以FieldName:cat,FieldName2:dog不要有空格");
var array = entityInfo.Discrimator.Split(',');
foreach (var disItem in array)
{
var name = disItem.Split(':').First();
var value = disItem.Split(':').Last();
queryable.Where(name, "=", value);
}
}
}
}
}