From 3ec65a96dd073e598e58c12fb0b5af31e38bc20e Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 14 5月 2025 14:48:51 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/WhereConditionsExtensions.cs | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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/WhereConditionsExtensions.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/WhereConditionsExtensions.cs"
index b6bf43d..a3698e0 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/WhereConditionsExtensions.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/WhereConditionsExtensions.cs"
@@ -52,7 +52,9 @@
try
{
var new_conditions = PredicateExtensions.GetConditionExpressionForFuzzyQuery<T>(pro_value_searchFormInputAttrs.ToArray(), pro_value_searchVal);
- conditions = conditions.And(new_conditions);
+ //And鏀逛负AndAlso锛岃В鍐砿ysql 澶勭悊And浼氬嚭閿欑殑闂(??And?? 閫氬父瀵瑰簲 ??鎸変綅涓� (&)??锛屼笉浼氱煭璺眰鍊硷紝鍙兘瀵艰嚧 SQL 鐢熸垚 NOT (NOT (...)) 杩欐牱鐨勫啑浣欓�昏緫,??AndAlso?? 瀵瑰簲 ??閫昏緫涓� (&&)??锛屼細鐭矾姹傚�硷紝鐢熸垚鐨� SQL 鏇寸畝娲侀珮鏁堛��) 銆怑ditby shaocx,2025-05-13銆�
+ //conditions = conditions.And(new_conditions);
+ conditions = conditions.Compose(new_conditions, Expression.AndAlso);
}
catch (Exception ex)
{
@@ -65,7 +67,9 @@
else if (i_pro_value_searchValMode == Convert.ToInt32(SearchFilterModeEnum.绮惧噯鏌ヨ))
{//绮惧噯鏌ヨ
var new_conditions = PredicateExtensions.GetConditionExpressionForPreciseQuery<T>(pro_value_searchFormInputAttrs.ToArray(), pro_value_searchVal);
- conditions = conditions.And(new_conditions);
+ //And鏀逛负AndAlso锛岃В鍐砿ysql 澶勭悊And浼氬嚭閿欑殑闂(??And?? 閫氬父瀵瑰簲 ??鎸変綅涓� (&)??锛屼笉浼氱煭璺眰鍊硷紝鍙兘瀵艰嚧 SQL 鐢熸垚 NOT (NOT (...)) 杩欐牱鐨勫啑浣欓�昏緫,??AndAlso?? 瀵瑰簲 ??閫昏緫涓� (&&)??锛屼細鐭矾姹傚�硷紝鐢熸垚鐨� SQL 鏇寸畝娲侀珮鏁堛��) 銆怑ditby shaocx,2025-05-13銆�
+ //conditions = conditions.And(new_conditions);
+ conditions = conditions.Compose(new_conditions, Expression.AndAlso);
/*
pro_value_searchFormInputAttrs.ForEach(x =>
{
@@ -107,12 +111,14 @@
if (hsmList.Count > 0)
{
var high_conditions = PredicateExtensions.GetConditionExpressionForHighFieldByAnd<T>(hsmList);
- conditions = conditions.And(high_conditions);
+ //And鏀逛负AndAlso锛岃В鍐砿ysql 澶勭悊And浼氬嚭閿欑殑闂(鈥嬧�婣nd鈥嬧�� 閫氬父瀵瑰簲 鈥嬧�嬫寜浣嶄笌 (&)鈥嬧�嬶紝涓嶄細鐭矾姹傚�硷紝鍙兘瀵艰嚧 SQL 鐢熸垚 NOT (NOT (...)) 杩欐牱鐨勫啑浣欓�昏緫,鈥嬧�婣ndAlso鈥嬧�� 瀵瑰簲 鈥嬧�嬮�昏緫涓� (&&)鈥嬧�嬶紝浼氱煭璺眰鍊硷紝鐢熸垚鐨� SQL 鏇寸畝娲侀珮鏁堛��) 銆怑ditby shaocx,2025-05-13銆�
+ conditions = conditions.Compose(high_conditions, Expression.AndAlso);
}
if (hsmForDatetimeList.Count > 0)
{
- var high_conditions = PredicateExtensions.GetConditionExpressionForHighFieldByAnd<T>(hsmForDatetimeList);
- conditions = conditions.And(high_conditions);
+ var high_conditions_dt = PredicateExtensions.GetConditionExpressionForHighFieldByAnd<T>(hsmForDatetimeList);
+ //conditions = conditions.And(high_conditions_dt);
+ conditions = conditions.Compose(high_conditions_dt, Expression.AndAlso);
}
#endregion
@@ -155,11 +161,17 @@
{
continue;
}
- List<string> arr_value = v as List<string>;
- if (arr_value.Count < 2)
+ //鍒ゆ柇瀛楃涓叉槸鍚︽湁,鍙�
+ List<string> arr_value = new List<string>();
+ string str_arr_value = v as string;
+ if (string.IsNullOrEmpty(str_arr_value)) continue;
+ if (str_arr_value.IndexOf(',') > -1)
{
- continue;
+ var arr = str_arr_value.Split(',');
+ if (arr.Length != 2) continue;
+ arr_value = arr.ToList();
}
+
//string[] arr_value = (string[])v;
//string[] arr_value = Convert.ToString(v).Split(',');
hsmForDatetimeList.Add(new HighSearchForDateTimeRangeModel()
--
Gitblit v1.9.3