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

Update Subquery.First()

Browse Source
This commit is contained in:
sunkaixuan
2023-03-12 17:36:08 +08:00
parent e1dbe38c71
commit e9af97b808
1 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs
View File

@@ -1710,10 +1710,20 @@ namespace SqlSugar
var setValue = Activator.CreateInstance(itemProperty.PropertyType, true) as IList;
if (typeof(TResult).IsAnonymousType())
{
var jobj = JObject.FromObject(item);
var prop = jobj.Property(itemProperty.Name);
prop.Value = JArray.FromObject(subList);
result[i] = jobj.ToObject<TResult>();
if (isFirst)
{
var jobj = JObject.FromObject(item);
var prop = jobj.Property(itemProperty.Name);
prop.Value = JObject.FromObject((subList as IList).Cast<object>().FirstOrDefault());
result[i] = jobj.ToObject<TResult>();
}
else
{
var jobj = JObject.FromObject(item);
var prop = jobj.Property(itemProperty.Name);
prop.Value = JArray.FromObject(subList);
result[i] = jobj.ToObject<TResult>();
}
}
else
{
@@ -1772,10 +1782,14 @@ namespace SqlSugar
var subList = ExpressionBuilderHelper.CallFunc(callType, methodParamters, this.Clone(), "SubQueryList");
var appendValue = this.QueryBuilder.AppendValues;
var list = (subList as IEnumerable).Cast<object>().ToList();
if (isFirst)
if (isFirst && !typeof(TResult).IsAnonymousType())
{
SetSubListWithClassFirst(result, itemProperty, appendValue, list, 0);
}
else if (isFirst && typeof(TResult).IsAnonymousType())
{
SetSubListWithAnonymousTypeFirst(result, itemProperty, appendValue, list, 0);
}
else if (typeof(TResult).IsAnonymousType())
{
SetSubListWithAnonymousType(result, itemProperty, appendValue, list, 0);
@@ -1812,6 +1826,36 @@ namespace SqlSugar
}
return resIndex;
}
private static int SetSubListWithAnonymousTypeFirst<TResult>(List<TResult> result, PropertyInfo itemProperty, List<List<QueryableAppendColumn>> appendValue, List<object> list, int resIndex)
{
for (int i = 0; i < result.Count; i++)
{
var item = result[i];
object setValue = null;
if (appendValue != null)
{
var appindex = 0;
foreach (var appValue in appendValue)
{
if (appValue[0].Value.ObjToInt() == i)
{
setValue = list[appindex];
//setValue.Add(addItem);
}
appindex++;
}
}
var jobj = JObject.FromObject(item);
var prop = jobj.Property(itemProperty.Name);
if (setValue != null)
{
prop.Value = JObject.FromObject(setValue);
}
result[i] = jobj.ToObject<TResult>();
//itemProperty.SetValue(item, setValue);
}
return resIndex;
}
private static int SetSubListWithClassFirst<TResult>(List<TResult> result, PropertyInfo itemProperty, List<List<QueryableAppendColumn>> appendValue, List<object> list, int resIndex)
{
foreach (var item in result)