lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-12-05 03:17:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update nav query

Browse Source
This commit is contained in:
sunkaixuan
2022-11-24 20:48:35 +08:00
parent bfffb0ff0f
commit ae72509ca4
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -609,6 +609,7 @@ namespace SqlSugar
else
{
var pkInfo = entityInfo.Columns.FirstOrDefault(x => x.IsPrimarykey);
result.SelectString = "";
if (pkInfo != null)
{
var pkName = pkInfo.DbColumnName;
@@ -622,6 +623,19 @@ namespace SqlSugar
AppColumns(result, queryable, navColumn.DbColumnName);
}
}
foreach (var nav in entityInfo.Columns.Where(x => x.Navigat != null && x.Navigat.NavigatType == NavigateType.OneToMany&& x.Navigat.Name2!=null))
{
var navColumn = entityInfo.Columns.FirstOrDefault(it => it.PropertyName == nav.Navigat.Name2);
if (navColumn != null)
{
AppColumns(result, queryable, navColumn.DbColumnName);
}
}
result.SelectString = result.SelectString.TrimStart(',');
if (result.SelectString == "")
{
result.SelectString = null;
}
}
if (properyName != null)
{
@@ -733,9 +747,9 @@ namespace SqlSugar
private static void AppColumns(SqlInfo result, ISugarQueryable<object> queryable, string columnName)
{
var selectPkName = queryable.SqlBuilder.GetTranslationColumnName(columnName);
if (result.SelectString.HasValue() && !result.SelectString.ToLower().Contains(selectPkName.ToLower()))
if (result.SelectString!=null && !result.SelectString.ToLower().Contains(selectPkName.ToLower()))
{
result.SelectString = result.SelectString + "," + selectPkName;
result.SelectString = result.SelectString + "," + (selectPkName +" AS "+ selectPkName);
}
}
public void CheckHasRootShortName(Expression rootExpression, Expression childExpression)