From 0cd95d98fdf7ed22d53398242feb2a3ca185cf09 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 13 5月 2025 15:38:35 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/PredicateExtensions/WhereHelper.cs | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/PredicateExtensions/WhereHelper.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/PredicateExtensions/WhereHelper.cs"
index eee8805..6fbd65f 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/PredicateExtensions/WhereHelper.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/PredicateExtensions/WhereHelper.cs"
@@ -17,7 +17,8 @@
private MemberExpression common_left;
- private UnaryExpression common_right;
+ //private UnaryExpression common_right;
+ private ConstantExpression common_right;
public WhereHelper()
@@ -53,7 +54,7 @@
var propertyValue = converter.ConvertFromInvariantString(value.ToString()); // 3
var constant = Expression.Constant(propertyValue);
- common_right = Expression.Convert(constant, propertyType); // 4
+ common_right = constant; // 4
// common_right = Expression.Constant(value, value.GetType());//鏋勫缓涓�涓父閲�,鍊兼槸 value
}
@@ -69,7 +70,7 @@
Expression result = Expression.Equal(common_left, common_right);
- filter = Expression.And(filter, result);
+ filter = Expression.AndAlso(filter, result);
}
/// <summary>
@@ -84,7 +85,7 @@
Expression result = Expression.NotEqual(common_left, common_right);
- filter = Expression.And(filter, result);
+ filter = Expression.AndAlso(filter, result);
}
@@ -100,7 +101,7 @@
Expression result = Expression.GreaterThan(common_left, common_right);
- filter = Expression.And(filter, result);
+ filter = Expression.AndAlso(filter, result);
}
@@ -116,7 +117,7 @@
Expression result = Expression.GreaterThanOrEqual(common_left, common_right);
- filter = Expression.And(filter, result);
+ filter = Expression.AndAlso(filter, result);
}
@@ -132,7 +133,7 @@
Expression result = Expression.LessThan(common_left, common_right);
- filter = Expression.And(filter, result);
+ filter = Expression.AndAlso(filter, result);
}
@@ -148,7 +149,7 @@
Expression result = Expression.LessThanOrEqual(common_left, common_right);
- filter = Expression.And(filter, result);
+ filter = Expression.AndAlso(filter, result);
}
@@ -167,7 +168,7 @@
Expression result = Expression.Call(left, typeof(string).GetMethod("Contains", new Type[] { typeof(string) }), right);
- filter = Expression.And(filter, result);
+ filter = Expression.AndAlso(filter, result);
}
--
Gitblit v1.9.3