lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-07-17 10:41:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

-

Browse Source
This commit is contained in:
sunkaixuan 2017-09-29 13:43:51 +08:00
parent 2cb53b0b88
commit f01064b0c9
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1008,13 +1008,23 @@ namespace SqlSugar
var sqlObj = this.ToSql(); var sqlObj = this.ToSql();
var isComplexModel = QueryBuilder.IsComplexModel(sqlObj.Key); var isComplexModel = QueryBuilder.IsComplexModel(sqlObj.Key);
var entityType = typeof(TResult); var entityType = typeof(TResult);
result = GetData<TResult>(sqlObj, isComplexModel, entityType);
RestoreMapping();
SetContextModel(result, entityType);
return result;
}
protected List<TResult> GetData<TResult>(KeyValuePair<string, List<SugarParameter>> sqlObj, bool isComplexModel, Type entityType)
{
List<TResult> result;
using (var dataReader = this.Db.GetDataReader(sqlObj.Key, sqlObj.Value.ToArray())) using (var dataReader = this.Db.GetDataReader(sqlObj.Key, sqlObj.Value.ToArray()))
{ {
if (typeof(TResult) == typeof(ExpandoObject)) if (typeof(TResult) == typeof(ExpandoObject))
{ {
result = this.Context.Utilities.DataReaderToExpandoObjectList(dataReader) as List<TResult>; result = this.Context.Utilities.DataReaderToExpandoObjectList(dataReader) as List<TResult>;
}else if (entityType.IsAnonymousType() || isComplexModel) }
else if (entityType.IsAnonymousType() || isComplexModel)
{ {
result = this.Context.Utilities.DataReaderToDynamicList<TResult>(dataReader); result = this.Context.Utilities.DataReaderToDynamicList<TResult>(dataReader);
} }
@ -1023,10 +1033,10 @@ namespace SqlSugar
result = this.Bind.DataReaderToList<TResult>(entityType, dataReader, QueryBuilder.SelectCacheKey); result = this.Bind.DataReaderToList<TResult>(entityType, dataReader, QueryBuilder.SelectCacheKey);
} }
} }
RestoreMapping();
SetContextModel(result, entityType);
return result; return result;
} }
protected void _InQueryable(Expression<Func<T, object>> expression, KeyValuePair<string, List<SugarParameter>> sqlObj) protected void _InQueryable(Expression<Func<T, object>> expression, KeyValuePair<string, List<SugarParameter>> sqlObj)
{ {
string sql = sqlObj.Key; string sql = sqlObj.Key;