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

Update gobal filter

Browse Source
This commit is contained in:
sunkaixuna
2021-10-17 11:20:53 +08:00
parent 3bc29d40b8
commit 881ede4362
1 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -331,36 +331,30 @@ namespace SqlSugar
BindingFlags flag = BindingFlags.Instance | BindingFlags.NonPublic; BindingFlags flag = BindingFlags.Instance | BindingFlags.NonPublic;
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 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();
if (ChildType != this.EntityType&&isSingle)
{
return;
}
var expValue = GetExpressionValue(exp, isSingle ? ResolveExpressType.WhereSingle : ResolveExpressType.WhereMultiple);
var sql = expValue.GetResultString();
var itName = (exp as LambdaExpression).Parameters[0].Name; var itName = (exp as LambdaExpression).Parameters[0].Name;
itName = this.Builder.GetTranslationColumnName(itName) + "."; itName = this.Builder.GetTranslationColumnName(itName) + ".";
var isEasyJoin = this.EasyJoinInfos.Count > 0; var isEasyJoin = this.EasyJoinInfos.Count > 0;
if (WhereInfos.Count == 0)
{ string sql = "";
sql =( " WHERE " + sql);
}else
{
sql = (" AND " + sql);
}
if (isSingle) if (isSingle)
{ {
if (ChildType != this.EntityType && isSingle)
{
return;
}
sql = GetSql(exp, isSingle);
} }
else if (isMain) else if (isMain)
{ {
if (TableShortName == null) if (TableShortName == null)
return; return;
var shortName = this.Builder.GetTranslationColumnName(TableShortName) + "."; var shortName = this.Builder.GetTranslationColumnName(TableShortName) + ".";
sql = GetSql(exp, isSingle);
sql = sql.Replace(itName, shortName); sql = sql.Replace(itName, shortName);
} }
else if (isEasyJoin) else if (isEasyJoin)
@@ -368,11 +362,12 @@ namespace SqlSugar
var easyInfo = EasyJoinInfos.FirstOrDefault(it => var easyInfo = EasyJoinInfos.FirstOrDefault(it =>
it.Value.Equals(entityInfo.DbTableName, StringComparison.CurrentCultureIgnoreCase) || it.Value.Equals(entityInfo.DbTableName, StringComparison.CurrentCultureIgnoreCase) ||
it.Value.Equals(entityInfo.EntityName, StringComparison.CurrentCultureIgnoreCase)); it.Value.Equals(entityInfo.EntityName, StringComparison.CurrentCultureIgnoreCase));
if (easyInfo.Key==null) if (easyInfo.Key == null)
{ {
return; return;
} }
var shortName = this.Builder.GetTranslationColumnName(easyInfo.Key.Trim()) + "."; var shortName = this.Builder.GetTranslationColumnName(easyInfo.Key.Trim()) + ".";
sql = GetSql(exp, isSingle);
sql = sql.Replace(itName, shortName); sql = sql.Replace(itName, shortName);
} }
else else
@@ -385,11 +380,28 @@ namespace SqlSugar
return; return;
} }
var shortName = this.Builder.GetTranslationColumnName(easyInfo.ShortName.Trim()) + "."; var shortName = this.Builder.GetTranslationColumnName(easyInfo.ShortName.Trim()) + ".";
sql = GetSql(exp, isSingle);
sql = sql.Replace(itName, shortName); sql = sql.Replace(itName, shortName);
} }
WhereInfos.Add(sql); WhereInfos.Add(sql);
} }
private string GetSql(Expression exp, bool isSingle)
{
var expValue = GetExpressionValue(exp, isSingle ? ResolveExpressType.WhereSingle : ResolveExpressType.WhereMultiple);
var sql = expValue.GetResultString();
if (WhereInfos.Count == 0)
{
sql = (" WHERE " + sql);
}
else
{
sql = (" AND " + sql);
}
return sql;
}
public virtual string GetExternalOrderBy(string externalOrderBy) public virtual string GetExternalOrderBy(string externalOrderBy)
{ {
return Regex.Replace(externalOrderBy, @"\[\w+\]\.", ""); return Regex.Replace(externalOrderBy, @"\[\w+\]\.", "");