tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-19 20:38:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 修复 UseGenerateCommandParameterWithLambda + Enum + MapType(string) bug；

Browse Source
This commit is contained in:
2881099
2020-12-21 08:28:14 +08:00
parent d3d77a3108
commit 7a276b19ad
3 changed files with 184 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FreeSql/Extensions/FreeSqlGlobalExtensions.cs
View File

@ -169,7 +169,7 @@ public static partial class FreeSqlGlobalExtensions
{
if (dict.TryGetValue(prop.Name, out var existsProp))
{
if (existsProp.DeclaringType != prop) dict[prop.Name] = prop;
if (existsProp.DeclaringType != prop.DeclaringType) dict[prop.Name] = prop;
continue;
}
dict.Add(prop.Name, prop);

14
FreeSql/Internal/CommonExpression.cs
View File

@ -550,6 +550,20 @@ namespace FreeSql.Internal
}
public string ExpressionBinary(string oper, Expression leftExp, Expression rightExp, ExpTSC tsc)
{
if (
leftExp.Type == rightExp.Type &&
leftExp.NodeType == ExpressionType.Convert &&
leftExp is UnaryExpression leftExpUexp &&
leftExpUexp.Operand?.Type.NullableTypeOrThis().IsEnum == true &&
rightExp.NodeType == ExpressionType.Convert &&
rightExp is UnaryExpression rightExpUexp &&
rightExpUexp.Operand?.Type.NullableTypeOrThis().IsEnum == true)
{
leftExp = leftExpUexp.Operand;
rightExp = rightExpUexp.Operand;
}
switch (oper)
{
case "OR":