lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-09-24 13:03:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update Navigate query

Browse Source
This commit is contained in:
sunkaixuan
2022-04-18 12:04:35 +08:00
parent 07fe826f66
commit 9faed01854
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/NavigatManager.cs
View File

@@ -223,7 +223,8 @@ namespace SqlSugar
{ {
foreach (var listItem in list) foreach (var listItem in list)
{ {
if (navObjectNamePropety.GetValue(listItem) == null)
{
var instance = Activator.CreateInstance(navObjectNamePropety.PropertyType, true); var instance = Activator.CreateInstance(navObjectNamePropety.PropertyType, true);
var ilist = instance as IList; var ilist = instance as IList;
foreach (var bInfo in bList) foreach (var bInfo in bList)
@@ -239,6 +240,7 @@ namespace SqlSugar
} }
} }
} }
}
private void OneToOne(List<object> list, Func<ISugarQueryable<object>, List<object>> selector, EntityInfo listItemEntity, System.Reflection.PropertyInfo navObjectNamePropety, EntityColumnInfo navObjectNameColumnInfo) private void OneToOne(List<object> list, Func<ISugarQueryable<object>, List<object>> selector, EntityInfo listItemEntity, System.Reflection.PropertyInfo navObjectNamePropety, EntityColumnInfo navObjectNameColumnInfo)
{ {
@@ -258,11 +260,14 @@ namespace SqlSugar
})); }));
var navList = selector(this.Context.Queryable<object>().AS(navEntityInfo.DbTableName).Where(conditionalModels)); var navList = selector(this.Context.Queryable<object>().AS(navEntityInfo.DbTableName).Where(conditionalModels));
foreach (var item in list) foreach (var item in list)
{
if (navObjectNamePropety.GetValue(item) == null)
{ {
var setValue = navList.FirstOrDefault(x => navPkColumn.PropertyInfo.GetValue(x).ObjToString() == navColumn.PropertyInfo.GetValue(item).ObjToString()); var setValue = navList.FirstOrDefault(x => navPkColumn.PropertyInfo.GetValue(x).ObjToString() == navColumn.PropertyInfo.GetValue(item).ObjToString());
navObjectNamePropety.SetValue(item, setValue); navObjectNamePropety.SetValue(item, setValue);
} }
} }
}
private void OneToMany(List<object> list, Func<ISugarQueryable<object>, List<object>> selector, EntityInfo listItemEntity, System.Reflection.PropertyInfo navObjectNamePropety, EntityColumnInfo navObjectNameColumnInfo) private void OneToMany(List<object> list, Func<ISugarQueryable<object>, List<object>> selector, EntityInfo listItemEntity, System.Reflection.PropertyInfo navObjectNamePropety, EntityColumnInfo navObjectNameColumnInfo)
{ {
@@ -287,6 +292,8 @@ namespace SqlSugar
if (navList.HasValue()) if (navList.HasValue())
{ {
foreach (var item in list) foreach (var item in list)
{
if (navObjectNamePropety.GetValue(item) == null)
{ {
var setValue = navList var setValue = navList
.Where(x => navColumn.PropertyInfo.GetValue(x).ObjToString() == listItemPkColumn.PropertyInfo.GetValue(item).ObjToString()).ToList(); .Where(x => navColumn.PropertyInfo.GetValue(x).ObjToString() == listItemPkColumn.PropertyInfo.GetValue(item).ObjToString()).ToList();
@@ -300,6 +307,7 @@ namespace SqlSugar
} }
} }
} }
}
private SqlInfo GetWhereSql() private SqlInfo GetWhereSql()
{ {