From 3560de8e63f166fc6cd7672af496cfb97496364c Mon Sep 17 00:00:00 2001
From: Hadi Khazaee Asl <hadi_khazaee_asl@yahoo.com>
Date: Mon, 28 Sep 2026 22:36:34 +0330
Subject: [PATCH] last ...

---
 Providers/XBaseEFRepository.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Providers/XBaseEFRepository.cs b/Providers/XBaseEFRepository.cs
index d06b7f1..a3f1600 100644
--- a/Providers/XBaseEFRepository.cs
+++ b/Providers/XBaseEFRepository.cs
@@ -732,14 +732,17 @@ namespace xDataService.Providers
             {
                 predicator = x => !x.Deleted;
             }
-            var result = (await AsQueryable(
+            var list = await AsQueryable(
                 asNoTracking: true,
                 orderBuilder: null,
                 predicate: predicator,
                 includeBuilder: includeBuilder
             )
-            .ToListAsync(cancellationToken))
-            .FirstOrDefault(predicate.Compile());
+            .ToListAsync(cancellationToken);
+
+            //
+            var whereClause = predicate.Compile(); 
+            var result = list.FirstOrDefault(x => whereClause(x));
 
             //
             return result;