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 .net core project

Browse Source
This commit is contained in:
sunkaixuan 2022-07-15 15:27:14 +08:00
parent b1bf42cf3d
commit bc06140aef
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/NavSelectHelper.cs
View File

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

4
Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/OneToManyNavgateExpression.cs
View File

@ -152,6 +152,10 @@ namespace SqlSugar
if (this.whereSql.HasValue())
{
mapper.Sql = mapper.Sql.TrimEnd(')');
if (this.whereSql.Contains($" {PropertyShortName}."))
{
this.whereSql = this.whereSql.Replace($" {PropertyShortName}.", $" {this.ProPertyEntity.DbTableName}_1.");
}
mapper.Sql = mapper.Sql + " AND " + this.whereSql+")";
}
if (MethodName == "Any")