lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-11-08 10:24:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update Filter

Browse Source
This commit is contained in:
skx
2021-01-30 13:25:28 +08:00
parent e5d0b6a6a6
commit c318342d63
1 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs
View File

@@ -295,13 +295,16 @@ namespace SqlSugar
if (!IsDisabledGobalFilter && this.Context.QueryFilter.GeFilterList.HasValue()) if (!IsDisabledGobalFilter && this.Context.QueryFilter.GeFilterList.HasValue())
{ {
var gobalFilterList = this.Context.QueryFilter.GeFilterList.Where(it => it.FilterName.IsNullOrEmpty()).ToList(); var gobalFilterList = this.Context.QueryFilter.GeFilterList.Where(it => it.FilterName.IsNullOrEmpty()).ToList();
foreach (var item in gobalFilterList.Where(it => it.IsJoinQuery == !IsSingle()))
foreach (var item in gobalFilterList)
{ {
if (item.GetType().Name.StartsWith("TableFilterItem")) if (item.GetType().Name.StartsWith("TableFilterItem"))
{ {
AppendTableFilter(item); AppendTableFilter(item);
} }
else }
foreach (var item in gobalFilterList.Where(it => it.IsJoinQuery == !IsSingle()))
{ {
var filterResult = item.FilterValue(this.Context); var filterResult = item.FilterValue(this.Context);
WhereInfos.Add(this.Builder.AppendWhereOrAnd(this.WhereInfos.IsNullOrEmpty(), filterResult.Sql + UtilConstants.Space)); WhereInfos.Add(this.Builder.AppendWhereOrAnd(this.WhereInfos.IsNullOrEmpty(), filterResult.Sql + UtilConstants.Space));
@@ -313,7 +316,6 @@ namespace SqlSugar
} }
} }
} }
}
private void AppendTableFilter(SqlFilterItem item) private void AppendTableFilter(SqlFilterItem item)
{ {
@@ -321,14 +323,46 @@ namespace SqlSugar
Type type = item.GetType(); Type type = item.GetType();
PropertyInfo field = type.GetProperty("exp", flag); PropertyInfo field = type.GetProperty("exp", flag);
Type ChildType = type.GetProperty("type", flag).GetValue(item,null) as Type; Type ChildType = type.GetProperty("type", flag).GetValue(item,null) as Type;
var entityInfo = this.Context.EntityMaintenance.GetEntityInfo(ChildType);
var exp=field.GetValue(item,null) as Expression; var exp=field.GetValue(item,null) as Expression;
var isMain = ChildType == this.EntityType; var isMain = ChildType == this.EntityType;
var isSingle = IsSingle(); var isSingle = IsSingle();
var expValue = GetExpressionValue(exp, isSingle ? ResolveExpressType.WhereSingle : ResolveExpressType.WhereMultiple); var expValue = GetExpressionValue(exp, isSingle ? ResolveExpressType.WhereSingle : ResolveExpressType.WhereMultiple);
var sql = expValue.GetResultString(); var sql = expValue.GetResultString();
if (!isSingle) var itName = (exp as LambdaExpression).Parameters[0].Name;
itName = this.Builder.GetTranslationColumnName(itName) + ".";
var isEasyJoin = this.EasyJoinInfos.Count > 0;
if (WhereInfos.Count == 0)
{
sql =( " WHERE " + sql);
}else
{
sql = (" AND " + sql);
}
if (isSingle)
{ {
}
else if (isMain)
{
var shortName = this.Builder.GetTranslationColumnName(TableShortName) + ".";
sql = sql.Replace(itName, shortName);
}
else if (isEasyJoin)
{
var easyInfo = EasyJoinInfos.FirstOrDefault(it =>
it.Value.Equals(entityInfo.DbTableName, StringComparison.CurrentCultureIgnoreCase) ||
it.Value.Equals(entityInfo.EntityName, StringComparison.CurrentCultureIgnoreCase));
var shortName = this.Builder.GetTranslationColumnName(easyInfo.Key) + ".";
sql = sql.Replace(itName, shortName);
}
else
{
var easyInfo = JoinQueryInfos.FirstOrDefault(it =>
it.TableName.Equals(entityInfo.DbTableName, StringComparison.CurrentCultureIgnoreCase) ||
it.TableName.Equals(entityInfo.EntityName, StringComparison.CurrentCultureIgnoreCase));
var shortName = this.Builder.GetTranslationColumnName(easyInfo.ShortName) + ".";
sql = sql.Replace(itName, shortName);
} }
WhereInfos.Add(sql); WhereInfos.Add(sql);
} }