Merge pull request #927 from Suxsem/master

Fix C# code generation for linkentities with OR root filter
rappen · Jul 8, 2023 · 252f2c9 · 252f2c9
2 parents 1de4b7c + f27dd10
commit 252f2c9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/FetchXmlBuilder/Converters/CSharpCodeGenerator.cs b/FetchXmlBuilder/Converters/CSharpCodeGenerator.cs
@@ -236,7 +236,7 @@ private string GetFilterLbL(string entity, FilterExpression filter, string owner
             var code = new StringBuilder();
             filter.FilterHint = $"{ownerName}.{(ownerType == OwnersType.Root ? "Criteria" : ownerType == OwnersType.Link ? "LinkCriteria" : "Filters")}";
             var rootfilters = filter.FilterHint.EndsWith("Criteria") || filter.FilterHint.EndsWith("Criteria.Filters");
-            if (ownerType == OwnersType.Sub)
+            if (ownerType == OwnersType.Sub || (ownerType == OwnersType.Link && (filter.FilterOperator == LogicalOperator.Or || !filter.Conditions.Any())))
             {
                 filter.FilterHint = GetVarName($"{ownerName}.{(filter.FilterOperator == LogicalOperator.Or ? "Or" : "And")}".Replace(".Criteria", "").Replace(".LinkCriteria", ""), several);
 
@@ -591,7 +591,7 @@ private string GetFilterOI(string entity, FilterExpression filter, string ownerN
                     break;
 
                 default:
-                    if (ownerType == OwnersType.Sub)
+                    if (ownerType == OwnersType.Sub || (ownerType == OwnersType.Link && (filter.FilterOperator == LogicalOperator.Or || !filter.Conditions.Any())))
                     {
                         code.Append($"{Indent(indentslevel)}new FilterExpression({(filter.FilterOperator == LogicalOperator.Or ? "LogicalOperator.Or" : "")}){CRLF}{Indent(indentslevel++)}{{{CRLF}");
                     }
@@ -1416,4 +1416,4 @@ internal enum AroundBy
         Parentheses,
         Braces
     }
-}
+}