lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-11-08 02:14:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update .net core project

Browse Source
This commit is contained in:
sunkaixuan
2022-06-07 20:42:20 +08:00
parent c2a2b20b8a
commit 72cab2ab26
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/NavigatManager.cs
View File

@@ -250,13 +250,42 @@ namespace SqlSugar
}
else
{
navObjectNamePropety.SetValue(listItem, instance);
if (sql.Skip != null || sql.Take != null)
{
var instanceCast = (instance as IList);
var newinstance = Activator.CreateInstance(navObjectNamePropety.PropertyType, true) as IList;
SkipTakeIList(sql, instanceCast, newinstance);
navObjectNamePropety.SetValue(listItem, newinstance);
}
else
{
navObjectNamePropety.SetValue(listItem, instance);
}
}
}
}
}
}
private static void SkipTakeIList(SqlInfo sql, IList instanceCast, IList newinstance)
{
var intArray = Enumerable.Range(0, instanceCast.Count);
if (sql.Skip != null)
{
intArray = intArray
.Skip(sql.Skip.Value);
}
if (sql.Take != null)
{
intArray = intArray
.Take(sql.Take.Value);
}
foreach (var i in intArray)
{
newinstance.Add(instanceCast[i]);
}
}
private void OneToOne(List<object> list, Func<ISugarQueryable<object>, List<object>> selector, EntityInfo listItemEntity, System.Reflection.PropertyInfo navObjectNamePropety, EntityColumnInfo navObjectNameColumnInfo)
{
var navColumn = listItemEntity.Columns.FirstOrDefault(it => it.PropertyName == navObjectNameColumnInfo.Navigat.Name);

2
Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
View File

@@ -540,7 +540,7 @@ namespace SqlSugar
ConditionalType = ConditionalType.Equal,
FieldName = column.DbColumnName,
FieldValue = value.ObjToString(),
CSharpTypeName=column.PropertyInfo.PropertyType.Name
CSharpTypeName=column.UnderType.Name
});
if (value != null && value.GetType().IsEnum())
{

2
Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/BinaryExpressionResolve.cs
View File

@@ -71,7 +71,7 @@ namespace SqlSugar
{
leftExpression = (leftExpression as UnaryExpression).Operand;
}
if (rightExpression is UnaryExpression && (rightExpression as UnaryExpression).Operand.Type == UtilConstants.BoolType && (rightExpression as UnaryExpression).NodeType == ExpressionType.Convert)
if (rightExpression is UnaryExpression&& (rightExpression as UnaryExpression).NodeType == ExpressionType.Convert)
{
rightExpression = (rightExpression as UnaryExpression).Operand;
}