SQLHelper 调整

TEAMModelOS.SDK/Module/AzureCosmosDB/Configuration/SQLHelper.cs

@@ -18,16 +18,16 @@ namespace TEAMModelOS.SDK.Module.AzureCosmosDB.Configuration
 
         public static void ReplaceKeyWords(ref StringBuilder sql) {
             sql.Replace(".order.", "['order'].");
-            sql.Replace(".order ", "['order']");
+            sql.Replace(".order ", "['order'] ");
 
             sql.Replace(".group.", "['group'].");
-            sql.Replace(".group ", "['group']");
+            sql.Replace(".group ", "['group'] ");
 
             sql.Replace(".end.", "['end'].");
-            sql.Replace(".end ", "['end']");
+            sql.Replace(".end ", "['end'] ");
 
             sql.Replace(".having.", "['having'].");
-            sql.Replace(".having ", "['having']");
+            sql.Replace(".having ", "['having'] ");
         }
 
 
@@ -205,6 +205,8 @@ namespace TEAMModelOS.SDK.Module.AzureCosmosDB.Configuration
                 {
                     sql.Append(" OFFSET " + offsetNum + " LIMIT " + limitNum);
                 }
+
+                ReplaceKeyWords(ref sql);
             }
         }
 

TEAMModelOS.SDK/Module/AzureCosmosDB/Implements/AzureCosmosDBRepository.cs

@@ -695,7 +695,6 @@ namespace TEAMModelOS.SDK.Module.AzureCosmosDB.Implements
             DocumentCollection collection=   await InitializeCollection<T>();
             StringBuilder sql = new StringBuilder("select value(c) from c");
             SQLHelper.GetSQL(dict,ref sql);
-            SQLHelper.ReplaceKeyWords(ref sql);
             //查询条数 -1是全部
             FeedOptions queryOptions = new FeedOptions { MaxItemCount = -1, EnableCrossPartitionQuery = IsPk };
             var query = CosmosClient.CreateDocumentQuery<T>(UriFactory.CreateDocumentCollectionUri(Database, collection.Id), sql.ToString(), queryOptions);
@@ -798,7 +797,6 @@ namespace TEAMModelOS.SDK.Module.AzureCosmosDB.Implements
                     }*/
                 StringBuilder sql = new StringBuilder("select value(c) from c");
                 SQLHelper.GetSQL(dict,ref sql);
-                SQLHelper.ReplaceKeyWords(ref sql);
                 FeedOptions queryOptions;
                 if (collection.PartitionKey.Paths.Count > 0)
                 {
@@ -827,7 +825,6 @@ namespace TEAMModelOS.SDK.Module.AzureCosmosDB.Implements
                 
                 StringBuilder sql = new StringBuilder("select value count(c) from c");
                 SQLHelper.GetSQL(dict, ref sql);
-                SQLHelper.ReplaceKeyWords(ref sql);
                 FeedOptions queryOptions;
                 if (collection.PartitionKey.Paths.Count > 0)
                 {