mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-09-19 01:58:13 +08:00
Update nav filter
This commit is contained in:
@@ -126,13 +126,26 @@ namespace SqlSugar
|
|||||||
{
|
{
|
||||||
type = null;
|
type = null;
|
||||||
}
|
}
|
||||||
mapper.Sql = queryable
|
var sqlObj = queryable
|
||||||
.AS(tableName)
|
.AS(tableName)
|
||||||
.ClearFilter(clearTypes)
|
.ClearFilter(clearTypes)
|
||||||
.Filter(type)
|
.Filter(type)
|
||||||
.WhereIF(Navigat.WhereSql.HasValue(), Navigat.WhereSql)
|
.WhereIF(Navigat.WhereSql.HasValue(), Navigat.WhereSql)
|
||||||
.Where($" {queryable.SqlBuilder.GetTranslationColumnName(ShorName)}.{name}={pk} ").Select(selectName).ToSql().Key;
|
.Where($" {queryable.SqlBuilder.GetTranslationColumnName(ShorName)}.{name}={pk} ").Select(selectName).ToSql();
|
||||||
|
mapper.Sql = sqlObj.Key;
|
||||||
mapper.Sql = $" ({mapper.Sql}) ";
|
mapper.Sql = $" ({mapper.Sql}) ";
|
||||||
|
|
||||||
|
if (type!=null&sqlObj.Value?.Any() == true)
|
||||||
|
{
|
||||||
|
foreach (var item in sqlObj.Value)
|
||||||
|
{
|
||||||
|
if (!this._memberExpressionResolve.Context.Parameters.Any(it => it.ParameterName == item.ParameterName))
|
||||||
|
{
|
||||||
|
this._memberExpressionResolve.Context.Parameters.Add(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return mapper;
|
return mapper;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user