Update nav filter

This commit is contained in:
sunkaixuan
2023-12-22 18:40:44 +08:00
parent ce29acfc75
commit c767f7a66b

View File

@@ -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;
} }
} }