lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-05-15 20:49:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update nav query

Browse Source
This commit is contained in:
sunkaixuan 2022-07-23 14:12:03 +08:00
parent e684b9aeb2
commit e436e76d6f
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/NavigatManager.cs
View File

@ -375,7 +375,7 @@ namespace SqlSugar
if (list.Any() && navObjectNamePropety.GetValue(list.First()) == null) if (list.Any() && navObjectNamePropety.GetValue(list.First()) == null)
{ {
var navList = selector(this.Context.Queryable<object>().AS(navEntityInfo.DbTableName).Filter(navEntityInfo.Type).AddParameters(sqlObj.Parameters).Where(conditionalModels).WhereIF(sqlObj.WhereString.HasValue(), sqlObj.WhereString).Select(sqlObj.SelectString).OrderByIF(sqlObj.OrderByString.HasValue(), sqlObj.OrderByString)); var navList = selector(this.Context.Queryable<object>(sqlObj.TableShortName).AS(navEntityInfo.DbTableName).Filter(navEntityInfo.Type).AddParameters(sqlObj.Parameters).Where(conditionalModels).WhereIF(sqlObj.WhereString.HasValue(), sqlObj.WhereString).Select(sqlObj.SelectString).OrderByIF(sqlObj.OrderByString.HasValue(), sqlObj.OrderByString));
if (navList.HasValue()) if (navList.HasValue())
{ {
//var setValue = navList //var setValue = navList
@ -517,7 +517,8 @@ namespace SqlSugar
{ {
CheckHasRootShortName(method.Arguments[0], method.Arguments[1]); CheckHasRootShortName(method.Arguments[0], method.Arguments[1]);
var exp = method.Arguments[1]; var exp = method.Arguments[1];
where.Add(" " +queryable.QueryBuilder.GetExpressionValue(exp, ResolveExpressType.WhereSingle).GetString()); where.Add(" " + queryable.QueryBuilder.GetExpressionValue(exp, ResolveExpressType.WhereSingle).GetString());
SetTableShortName(result, queryable);
} }
else if (method.Method.Name == "WhereIF") else if (method.Method.Name == "WhereIF")
{ {
@ -527,12 +528,14 @@ namespace SqlSugar
var exp = method.Arguments[2]; var exp = method.Arguments[2];
CheckHasRootShortName(method.Arguments[1], method.Arguments[2]); CheckHasRootShortName(method.Arguments[1], method.Arguments[2]);
where.Add(" " + queryable.QueryBuilder.GetExpressionValue(exp, ResolveExpressType.WhereSingle).GetString()); where.Add(" " + queryable.QueryBuilder.GetExpressionValue(exp, ResolveExpressType.WhereSingle).GetString());
SetTableShortName(result, queryable);
} }
} }
else if (method.Method.Name == "OrderBy") else if (method.Method.Name == "OrderBy")
{ {
var exp = method.Arguments[1]; var exp = method.Arguments[1];
oredrBy.Add(" " + queryable.QueryBuilder.GetExpressionValue(exp, ResolveExpressType.WhereSingle).GetString()); oredrBy.Add(" " + queryable.QueryBuilder.GetExpressionValue(exp, ResolveExpressType.WhereSingle).GetString());
SetTableShortName(result, queryable);
} }
else if (method.Method.Name == "MappingField") else if (method.Method.Name == "MappingField")
{ {
@ -645,6 +648,14 @@ namespace SqlSugar
return result; return result;
} }
private static void SetTableShortName(SqlInfo result, ISugarQueryable<object> queryable)
{
if (queryable.QueryBuilder.TableShortName.HasValue()&& result.TableShortName.IsNullOrEmpty())
{
result.TableShortName = queryable.QueryBuilder.TableShortName;
}
}
private static void AppColumns(SqlInfo result, ISugarQueryable<object> queryable, string columnName) private static void AppColumns(SqlInfo result, ISugarQueryable<object> queryable, string columnName)
{ {
var selectPkName = queryable.SqlBuilder.GetTranslationColumnName(columnName); var selectPkName = queryable.SqlBuilder.GetTranslationColumnName(columnName);
@ -692,6 +703,7 @@ namespace SqlSugar
public string SelectString { get; set; } public string SelectString { get; set; }
public List<SugarParameter> Parameters { get; set; } public List<SugarParameter> Parameters { get; set; }
public List<MappingFieldsExpression> MappingExpressions { get; set; } public List<MappingFieldsExpression> MappingExpressions { get; set; }
public string TableShortName { get; set; }
} }
} }

16
Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/NavigatManager.cs
View File

@ -375,7 +375,7 @@ namespace SqlSugar
if (list.Any() && navObjectNamePropety.GetValue(list.First()) == null) if (list.Any() && navObjectNamePropety.GetValue(list.First()) == null)
{ {
var navList = selector(this.Context.Queryable<object>().AS(navEntityInfo.DbTableName).Filter(navEntityInfo.Type).AddParameters(sqlObj.Parameters).Where(conditionalModels).WhereIF(sqlObj.WhereString.HasValue(), sqlObj.WhereString).Select(sqlObj.SelectString).OrderByIF(sqlObj.OrderByString.HasValue(), sqlObj.OrderByString)); var navList = selector(this.Context.Queryable<object>(sqlObj.TableShortName).AS(navEntityInfo.DbTableName).Filter(navEntityInfo.Type).AddParameters(sqlObj.Parameters).Where(conditionalModels).WhereIF(sqlObj.WhereString.HasValue(), sqlObj.WhereString).Select(sqlObj.SelectString).OrderByIF(sqlObj.OrderByString.HasValue(), sqlObj.OrderByString));
if (navList.HasValue()) if (navList.HasValue())
{ {
//var setValue = navList //var setValue = navList
@ -517,7 +517,8 @@ namespace SqlSugar
{ {
CheckHasRootShortName(method.Arguments[0], method.Arguments[1]); CheckHasRootShortName(method.Arguments[0], method.Arguments[1]);
var exp = method.Arguments[1]; var exp = method.Arguments[1];
where.Add(" " +queryable.QueryBuilder.GetExpressionValue(exp, ResolveExpressType.WhereSingle).GetString()); where.Add(" " + queryable.QueryBuilder.GetExpressionValue(exp, ResolveExpressType.WhereSingle).GetString());
SetTableShortName(result, queryable);
} }
else if (method.Method.Name == "WhereIF") else if (method.Method.Name == "WhereIF")
{ {
@ -527,12 +528,14 @@ namespace SqlSugar
var exp = method.Arguments[2]; var exp = method.Arguments[2];
CheckHasRootShortName(method.Arguments[1], method.Arguments[2]); CheckHasRootShortName(method.Arguments[1], method.Arguments[2]);
where.Add(" " + queryable.QueryBuilder.GetExpressionValue(exp, ResolveExpressType.WhereSingle).GetString()); where.Add(" " + queryable.QueryBuilder.GetExpressionValue(exp, ResolveExpressType.WhereSingle).GetString());
SetTableShortName(result, queryable);
} }
} }
else if (method.Method.Name == "OrderBy") else if (method.Method.Name == "OrderBy")
{ {
var exp = method.Arguments[1]; var exp = method.Arguments[1];
oredrBy.Add(" " + queryable.QueryBuilder.GetExpressionValue(exp, ResolveExpressType.WhereSingle).GetString()); oredrBy.Add(" " + queryable.QueryBuilder.GetExpressionValue(exp, ResolveExpressType.WhereSingle).GetString());
SetTableShortName(result, queryable);
} }
else if (method.Method.Name == "MappingField") else if (method.Method.Name == "MappingField")
{ {
@ -645,6 +648,14 @@ namespace SqlSugar
return result; return result;
} }
private static void SetTableShortName(SqlInfo result, ISugarQueryable<object> queryable)
{
if (queryable.QueryBuilder.TableShortName.HasValue()&& result.TableShortName.IsNullOrEmpty())
{
result.TableShortName = queryable.QueryBuilder.TableShortName;
}
}
private static void AppColumns(SqlInfo result, ISugarQueryable<object> queryable, string columnName) private static void AppColumns(SqlInfo result, ISugarQueryable<object> queryable, string columnName)
{ {
var selectPkName = queryable.SqlBuilder.GetTranslationColumnName(columnName); var selectPkName = queryable.SqlBuilder.GetTranslationColumnName(columnName);
@ -692,6 +703,7 @@ namespace SqlSugar
public string SelectString { get; set; } public string SelectString { get; set; }
public List<SugarParameter> Parameters { get; set; } public List<SugarParameter> Parameters { get; set; }
public List<MappingFieldsExpression> MappingExpressions { get; set; } public List<MappingFieldsExpression> MappingExpressions { get; set; }
public string TableShortName { get; set; }
} }
} }