chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

条件判断添加空或者非空；调整相等与否的判断

Browse Source
usertest
zhangxiaofeng 3 months ago
parent 95e95eab62
commit e5d9808da5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File

8
ds-wms-service/DS.Module.Core/Condition/ConditionHelper.cs
Unescape Escape View File

@ -56,13 +56,17 @@ namespace DS.Module.Core.Condition
switch (item.Operator) switch (item.Operator)
{ {
case "equal": case "equal":
itemResult = valStr?.Equals(item.Value, StringComparison.OrdinalIgnoreCase) == true; break; itemResult = (valStr == null && item.Value == null) || valStr?.Equals(item.Value, StringComparison.OrdinalIgnoreCase) == true; break;
case "not_equal": case "not_equal":
itemResult = valStr?.Equals(item.Value, StringComparison.OrdinalIgnoreCase) != true; break; itemResult = (valStr != null || item.Value != null) && valStr?.Equals(item.Value, StringComparison.OrdinalIgnoreCase) != true; break;
case "contains": case "contains":
itemResult = valStr?.Contains(item.Value, StringComparison.OrdinalIgnoreCase) == true; break; itemResult = valStr?.Contains(item.Value, StringComparison.OrdinalIgnoreCase) == true; break;
case "not_contain": case "not_contain":
itemResult = valStr?.Contains(item.Value, StringComparison.OrdinalIgnoreCase) != true; break; itemResult = valStr?.Contains(item.Value, StringComparison.OrdinalIgnoreCase) != true; break;
case "empty":
itemResult = string.IsNullOrWhiteSpace(valStr) == true; break;
case "not_empty":
itemResult = string.IsNullOrWhiteSpace(valStr) != true; break;
case "start_with": case "start_with":
itemResult = valStr?.StartsWith(item.Value, StringComparison.OrdinalIgnoreCase) == true; break; itemResult = valStr?.StartsWith(item.Value, StringComparison.OrdinalIgnoreCase) == true; break;
case "end_with": case "end_with":

Write Preview
Loading…
Cancel
Save