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

Update nav

Browse Source
This commit is contained in:
sunkaixuan 2023-12-22 17:41:54 +08:00
parent f8efc4515c
commit eca37786d3
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/MemberExpressionResolve.cs
View File

@ -270,7 +270,7 @@ namespace SqlSugar
private void ResolveMemberValue(ExpressionParameter parameter, ExpressionParameter baseParameter, MemberExpression expression, bool? isLeft, bool isSetTempData)
{
var nav = new OneToOneNavgateExpression(this.Context?.SugarContext?.Context);
var nav = new OneToOneNavgateExpression(this.Context?.SugarContext?.Context,this);
nav.ExpContext = this.Context;
var navN = new OneToOneNavgateExpressionN(this.Context?.SugarContext?.Context);
if (nav.IsNavgate(expression))

21
Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/OneToOneNavgateExpression.cs
View File

@ -17,9 +17,11 @@ namespace SqlSugar
private Navigate Navigat;
public string ShorName;
internal string MemberName;
public OneToOneNavgateExpression(SqlSugarProvider context)
private MemberExpressionResolve _memberExpressionResolve;
public OneToOneNavgateExpression(SqlSugarProvider context, MemberExpressionResolve memberExpressionResolve)
{
this.context = context;
_memberExpressionResolve= memberExpressionResolve;
}
internal bool IsNavgate(Expression expression)
@ -110,9 +112,24 @@ namespace SqlSugar
(queryable.QueryBuilder.Builder.GetTranslationColumnName(dbName), queryable.QueryBuilder.Builder.GetTranslationColumnName(tableName));
}
}
Type[] clearTypes = null;
var isClearFilter = false;
if (this._memberExpressionResolve?.Context?.SugarContext?.QueryBuilder != null)
{
queryable.QueryBuilder.LambdaExpressions.ParameterIndex = 500 + this._memberExpressionResolve.Context.SugarContext.QueryBuilder.LambdaExpressions.ParameterIndex;
this._memberExpressionResolve.Context.SugarContext.QueryBuilder.LambdaExpressions.ParameterIndex++;
isClearFilter = this._memberExpressionResolve.Context.SugarContext.QueryBuilder.IsDisabledGobalFilter;
clearTypes = this._memberExpressionResolve.Context.SugarContext.QueryBuilder.RemoveFilters;
}
var type = this.ProPertyEntity.Columns.Count(it => it.IsPrimarykey) > 1 ? this.ProPertyEntity.Type : null;
if (isClearFilter)
{
type = null;
}
mapper.Sql = queryable
.AS(tableName)
.Filter(this.ProPertyEntity.Columns.Count(it=>it.IsPrimarykey)>1?this.ProPertyEntity.Type:null)
.ClearFilter(clearTypes)
.Filter(type)
.WhereIF(Navigat.WhereSql.HasValue(),Navigat.WhereSql)
.Where($" {queryable.SqlBuilder.GetTranslationColumnName(ShorName)}.{name}={pk} ").Select(selectName).ToSql().Key;
mapper.Sql = $" ({mapper.Sql}) ";