update /

TEAMModelOS.SDK/DI/AzureCosmos/AzureCosmosExtensions.cs

@@ -10,7 +10,6 @@ using System.Linq;
 using Azure;
 using TEAMModelOS.SDK.DI;
 using System.IO;
-using TEAMModelOS.SDK.DI;
 using System.Diagnostics;
 using Azure.Cosmos;
 using System.Text.Json;
@@ -21,6 +20,7 @@ using TEAMModelOS.SDK.Helper.Common.JsonHelper;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.OpenEntity;
+using OpenXmlPowerTools;
 
 namespace TEAMModelOS.SDK.DI
 {
@@ -134,7 +134,9 @@ namespace TEAMModelOS.SDK.DI
                         list.Add(obj.ToObject<T>());
                     }
                 }
-                if (queryDefinition.QueryText.Contains(" distinct ", StringComparison.OrdinalIgnoreCase) || queryDefinition.QueryText.Contains(" order by ", StringComparison.OrdinalIgnoreCase))
+                if (queryDefinition.QueryText.Contains(" distinct ", StringComparison.OrdinalIgnoreCase) ||
+                    (queryDefinition.QueryText.Contains(" order ", StringComparison.OrdinalIgnoreCase) &&
+                    !queryDefinition.QueryText.Contains(".order ", StringComparison.OrdinalIgnoreCase)))
                 {
                     continuationToken = null;
                 }
@@ -171,7 +173,7 @@ namespace TEAMModelOS.SDK.DI
                         list.Add(obj.ToObject<T>());
                     }
                 }
-                if (sql.Contains(" distinct ", StringComparison.OrdinalIgnoreCase) || sql.Contains(" order by ", StringComparison.OrdinalIgnoreCase))
+                if (sql.Contains(" distinct ", StringComparison.OrdinalIgnoreCase) || (sql.Contains(" order ", StringComparison.OrdinalIgnoreCase) && !sql.Contains(".order ", StringComparison.OrdinalIgnoreCase)))
                 {
                     continuationToken = null;
                 }