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

Optimized code

Browse Source
This commit is contained in:
sunkaixuan
2023-10-21 12:03:41 +08:00
parent 287e497b28
commit 965bf9b577
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -354,6 +354,12 @@ namespace SqlSugar
if (list.Any()&&navObjectNamePropety.GetValue(list.First()) == null) if (list.Any()&&navObjectNamePropety.GetValue(list.First()) == null)
{ {
var sqlObj = GetWhereSql(navObjectNameColumnInfo.Navigat.Name); var sqlObj = GetWhereSql(navObjectNameColumnInfo.Navigat.Name);
if (sqlObj.SelectString == null)
{
var columns=navEntityInfo.Columns.Where(it => !it.IsIgnore)
.Select(it=>QueryBuilder.Builder.GetTranslationColumnName(it.DbColumnName)+" AS "+ QueryBuilder.Builder.GetTranslationColumnName(it.PropertyName)).ToList();
sqlObj.SelectString= String.Join(",", columns);
}
var navList = selector(db.Queryable<object>().ClearFilter(QueryBuilder.RemoveFilters).Filter(navPkColumn.IsPrimarykey?null:this.QueryBuilder?.IsDisabledGobalFilter == true ? null : navEntityInfo.Type).AS(navEntityInfo.DbTableName) var navList = selector(db.Queryable<object>().ClearFilter(QueryBuilder.RemoveFilters).Filter(navPkColumn.IsPrimarykey?null:this.QueryBuilder?.IsDisabledGobalFilter == true ? null : navEntityInfo.Type).AS(navEntityInfo.DbTableName)
.WhereIF(navObjectNameColumnInfo.Navigat.WhereSql.HasValue(), navObjectNameColumnInfo.Navigat.WhereSql) .WhereIF(navObjectNameColumnInfo.Navigat.WhereSql.HasValue(), navObjectNameColumnInfo.Navigat.WhereSql)
.WhereIF(sqlObj.WhereString.HasValue(),sqlObj.WhereString) .WhereIF(sqlObj.WhereString.HasValue(),sqlObj.WhereString)
@@ -420,6 +426,12 @@ namespace SqlSugar
if (list.Any() && navObjectNamePropety.GetValue(list.First()) == null) if (list.Any() && navObjectNamePropety.GetValue(list.First()) == null)
{ {
if (sqlObj.SelectString == null)
{
var columns = navEntityInfo.Columns.Where(it => !it.IsIgnore)
.Select(it => QueryBuilder.Builder.GetTranslationColumnName(it.DbColumnName) + " AS " + QueryBuilder.Builder.GetTranslationColumnName(it.PropertyName)).ToList();
sqlObj.SelectString = String.Join(",", columns);
}
var navList = selector(childDb.Queryable<object>(sqlObj.TableShortName).AS(navEntityInfo.DbTableName).ClearFilter(QueryBuilder.RemoveFilters).Filter(this.QueryBuilder?.IsDisabledGobalFilter == true ? null : navEntityInfo.Type).AddParameters(sqlObj.Parameters).Where(conditionalModels).WhereIF(sqlObj.WhereString.HasValue(), sqlObj.WhereString).WhereIF(navObjectNameColumnInfo?.Navigat?.WhereSql!=null, navObjectNameColumnInfo?.Navigat?.WhereSql).Select(sqlObj.SelectString).OrderByIF(sqlObj.OrderByString.HasValue(), sqlObj.OrderByString)); var navList = selector(childDb.Queryable<object>(sqlObj.TableShortName).AS(navEntityInfo.DbTableName).ClearFilter(QueryBuilder.RemoveFilters).Filter(this.QueryBuilder?.IsDisabledGobalFilter == true ? null : navEntityInfo.Type).AddParameters(sqlObj.Parameters).Where(conditionalModels).WhereIF(sqlObj.WhereString.HasValue(), sqlObj.WhereString).WhereIF(navObjectNameColumnInfo?.Navigat?.WhereSql!=null, navObjectNameColumnInfo?.Navigat?.WhereSql).Select(sqlObj.SelectString).OrderByIF(sqlObj.OrderByString.HasValue(), sqlObj.OrderByString));
if (navList.HasValue()) if (navList.HasValue())
{ {