mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-09-22 20:13:41 +08:00
Synchronization code
This commit is contained in:
@@ -721,6 +721,7 @@ namespace SqlSugar
|
|||||||
{
|
{
|
||||||
if (result.Any())
|
if (result.Any())
|
||||||
{
|
{
|
||||||
|
IList outList = null;
|
||||||
foreach (var it in managers)
|
foreach (var it in managers)
|
||||||
{
|
{
|
||||||
var manager = it;
|
var manager = it;
|
||||||
@@ -732,7 +733,14 @@ namespace SqlSugar
|
|||||||
.Where(a => this.QueryBuilder.AppendNavInfo.Result.First().result.ContainsKey("SugarNav_" + a.PropertyName))
|
.Where(a => this.QueryBuilder.AppendNavInfo.Result.First().result.ContainsKey("SugarNav_" + a.PropertyName))
|
||||||
.ToList();
|
.ToList();
|
||||||
var listType = typeof(List<>).MakeGenericType(tType);
|
var listType = typeof(List<>).MakeGenericType(tType);
|
||||||
var outList = SelectNavQuery_SetList(result, it, p, tType, columns, listType);
|
if (outList == null)
|
||||||
|
{
|
||||||
|
outList = SelectNavQuery_SetList(result, it, p, tType, columns, listType);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
p.SetValue(it, outList);
|
||||||
|
}
|
||||||
it.GetType().GetMethod("Execute").Invoke(it, null);
|
it.GetType().GetMethod("Execute").Invoke(it, null);
|
||||||
SelectNavQuery_MappingList(it, result, outList, allColumns.Where(a => a.Navigat != null).ToList());
|
SelectNavQuery_MappingList(it, result, outList, allColumns.Where(a => a.Navigat != null).ToList());
|
||||||
}
|
}
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
<package >
|
<package >
|
||||||
<metadata>
|
<metadata>
|
||||||
<id>SqlSugarCore</id>
|
<id>SqlSugarCore</id>
|
||||||
<version>5.1.4.102</version>
|
<version>5.1.4.103-preview18</version>
|
||||||
<authors>sunkaixuan</authors>
|
<authors>sunkaixuan</authors>
|
||||||
<owners>果糖大数据科技</owners>
|
<owners>果糖大数据科技</owners>
|
||||||
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</licenseUrl>
|
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</licenseUrl>
|
||||||
|
Reference in New Issue
Block a user