diff --git a/Src/Asp.Net/SqlServerTest/UnitTest/UnitManyToMany.cs b/Src/Asp.Net/SqlServerTest/UnitTest/UnitManyToMany.cs index 7d951c0e0..edc3f274a 100644 --- a/Src/Asp.Net/SqlServerTest/UnitTest/UnitManyToMany.cs +++ b/Src/Asp.Net/SqlServerTest/UnitTest/UnitManyToMany.cs @@ -38,9 +38,9 @@ namespace OrmTest db.Queryable() .Includes(x => x.Roles).Where(x => x.Roles.Any(z=>z.id==1)) .ToList(); - db.Queryable() + var list=db.Queryable() .Includes(x => x.Roles).Where(x => x.Roles.Any()) - .ToList(); + .ToListAsync().GetAwaiter().GetResult(); //db.Queryable() // .Includes(x => x.Roles.Where(z=>z.name==x.realname).ToList()) // .ToList(); diff --git a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs index 78c7d7fc1..f10d16ca4 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs @@ -2332,6 +2332,13 @@ namespace SqlSugar _InitNavigat(result); return result; } + private async Task _InitNavigatAsync(List result) + { + if (this.QueryBuilder.Includes != null) + { + await Task.Run(() => { _InitNavigat(result); }); + } + } private void _InitNavigat(List result) { @@ -2366,7 +2373,7 @@ namespace SqlSugar } RestoreMapping(); _Mapper(result); - await Task.Run(() => { _InitNavigat(result); }); + await _InitNavigatAsync(result); return result; }