Merge pull request #2 from rappen/patch-1

Fixing #1 GetAll + GetFirst problem
MscrmTools · Dec 5, 2022 · cba7502 · cba7502
2 parents 0da7ffd + 66058c6
commit cba7502
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/MscrmTools.Shared/Query.cs b/MscrmTools.Shared/Query.cs
@@ -1,4 +1,4 @@
-using Microsoft.Xrm.Sdk;
+using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Query;
 using MscrmTools.FluentQueryExpressions.Helpers;
 using System;
@@ -4346,6 +4346,8 @@ public List<T> GetAll(IOrganizationService service)
                     .ToList();
             }
 
+            var tmpPagingNumber = QueryExpression.PageInfo.PageNumber;
+            var tmpPagingCookie = QueryExpression.PageInfo.PagingCookie;
             EntityCollection ec;
             var list = new List<T>();
             do
@@ -4357,6 +4359,8 @@ public List<T> GetAll(IOrganizationService service)
                 NextPage(ec.PagingCookie);
             } while (ec.MoreRecords);
 
+            QueryExpression.PageInfo.PageNumber = tmpPagingNumber;
+            QueryExpression.PageInfo.PagingCookie = tmpPagingCookie;
             return list;
         }
 
@@ -4576,4 +4580,4 @@ public T GetById(Guid id, IOrganizationService service, bool isActivityEntity =
 
         #endregion Service calls
     }
-}
+}