lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-08-24 07:22:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update navSelectHelper

Browse Source
This commit is contained in:
sunkaixuan 2022-07-15 15:23:58 +08:00
parent 8706ad9c8f
commit b1bf42cf3d
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/NavSelectHelper.cs
View File

@ -21,7 +21,7 @@ namespace SqlSugar
.Select(expression) .Select(expression)
.ToList(); .ToList();
var includeQueryable = queryableProvider.Clone(); var includeQueryable = queryableProvider.Clone();
includeQueryable.Select(GetGroupSelect(typeof(T), queryableProvider.Context)); includeQueryable.Select(GetGroupSelect(typeof(T), queryableProvider.Context,queryableProvider.QueryBuilder));
includeQueryable.QueryBuilder.NoCheckInclude=true; includeQueryable.QueryBuilder.NoCheckInclude=true;
MegerList(result, includeQueryable.ToList(), sqlfuncQueryable.Context); MegerList(result, includeQueryable.ToList(), sqlfuncQueryable.Context);
} }
@ -53,7 +53,7 @@ namespace SqlSugar
.Select(expression) .Select(expression)
.ToListAsync(); .ToListAsync();
var includeQueryable = queryableProvider.Clone(); var includeQueryable = queryableProvider.Clone();
includeQueryable.Select(GetGroupSelect(typeof(T), queryableProvider.Context)); includeQueryable.Select(GetGroupSelect(typeof(T), queryableProvider.Context, queryableProvider.QueryBuilder));
includeQueryable.QueryBuilder.NoCheckInclude = true; includeQueryable.QueryBuilder.NoCheckInclude = true;
MegerList(result,await includeQueryable.ToListAsync(), sqlfuncQueryable.Context); MegerList(result,await includeQueryable.ToListAsync(), sqlfuncQueryable.Context);
} }
@ -75,14 +75,21 @@ namespace SqlSugar
return result; return result;
} }
private static string GetGroupSelect(Type type,SqlSugarProvider context) private static string GetGroupSelect(Type type,SqlSugarProvider context,QueryBuilder queryBuilder)
{ {
var entity = context.EntityMaintenance.GetEntityInfo(type); var entity = context.EntityMaintenance.GetEntityInfo(type);
List<string> selector = new List<string>(); List<string> selector = new List<string>();
foreach (var item in entity.Columns.Where(it=>it.IsIgnore==false)) foreach (var item in entity.Columns.Where(it=>it.IsIgnore==false))
{
if (queryBuilder.TableShortName.HasValue())
{
selector.Add($" min({queryBuilder.TableShortName}.{item.DbColumnName}) as {item.DbColumnName}");
}
else
{ {
selector.Add($" min({item.DbColumnName}) as {item.DbColumnName}"); selector.Add($" min({item.DbColumnName}) as {item.DbColumnName}");
} }
}
return string.Join(",", selector); return string.Join(",", selector);
} }