mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-05-03 04:13:48 +08:00
Synchronization code
This commit is contained in:
parent
af6e5f4558
commit
74fa8e49ce
@ -1349,7 +1349,11 @@ namespace SqlSugar
|
||||
return MergeTableWithSubToListJoin();
|
||||
}
|
||||
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.NoCheckInclude = true;
|
||||
result.QueryBuilder.Includes = this.QueryBuilder.Includes;
|
||||
|
@ -679,6 +679,10 @@ namespace SqlSugar
|
||||
if (IsExists(sql))
|
||||
{
|
||||
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();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user