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

Synchronization code

Browse Source
This commit is contained in:
sunkaixuan 2023-08-10 18:49:11 +08:00
parent af6e5f4558
commit 74fa8e49ce
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
View File

@ -1349,7 +1349,11 @@ namespace SqlSugar
return MergeTableWithSubToListJoin(); return MergeTableWithSubToListJoin();
} }
var index = QueryBuilder.WhereIndex + 1; var index = QueryBuilder.WhereIndex + 1;
var result = this.Context.Queryable<T>().AS(SqlBuilder.GetPackTable(sqlobj.Key, "MergeTable")).AddParameters(sqlobj.Value).Select("*").With(SqlWith.Null); var result =
this.EntityInfo.Discrimator.HasValue()?
this.Context.Queryable<object>().AS(SqlBuilder.GetPackTable(sqlobj.Key, "MergeTable")).AddParameters(sqlobj.Value).Select<T>("*").With(SqlWith.Null)
:
this.Context.Queryable<T>().AS(SqlBuilder.GetPackTable(sqlobj.Key, "MergeTable")).AddParameters(sqlobj.Value).Select("*").With(SqlWith.Null);
result.QueryBuilder.WhereIndex = index; result.QueryBuilder.WhereIndex = index;
result.QueryBuilder.NoCheckInclude = true; result.QueryBuilder.NoCheckInclude = true;
result.QueryBuilder.Includes = this.QueryBuilder.Includes; result.QueryBuilder.Includes = this.QueryBuilder.Includes;

4
Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateableHelper.cs
View File

@ -679,6 +679,10 @@ namespace SqlSugar
if (IsExists(sql)) if (IsExists(sql))
{ {
whereSql = Regex.Match(sql, @"\(EXISTS.+").Value; whereSql = Regex.Match(sql, @"\(EXISTS.+").Value;
if (sql.Contains("((EXISTS"))
{
whereSql = $"({whereSql}";
}
} }
dt = this.Context.Queryable<T>().Filter(null, true).Where(whereSql).AddParameters(parameters).ToDataTable(); dt = this.Context.Queryable<T>().Filter(null, true).Where(whereSql).AddParameters(parameters).ToDataTable();
} }