diff --git a/src/CMSMicroservice.WebApi/Services/DiscountOrderService.cs b/src/CMSMicroservice.WebApi/Services/DiscountOrderService.cs
index db640c2..f5967cd 100644
--- a/src/CMSMicroservice.WebApi/Services/DiscountOrderService.cs
+++ b/src/CMSMicroservice.WebApi/Services/DiscountOrderService.cs
@@ -86,10 +86,9 @@ public class DiscountOrderService : DiscountOrderContract.DiscountOrderContractB
 
     public override async Task<GetOrderByIdResponse> GetOrderById(GetOrderByIdRequest request, ServerCallContext context)
     {
-        var currentUserId = GetCurrentUserId();
-        long? filterUserId = request.UserId > 0
-            ? request.UserId
-            : (currentUserId > 0 ? currentUserId : null);
+        // اگر UserId ارسال شده > 0 باشد، آن را استفاده کن (customer lookup)
+        // اگر UserId = 0 باشد، بدون فیلتر (admin access)
+        long? filterUserId = request.UserId > 0 ? request.UserId : null;
 
         var query = new GetOrderByIdQuery
         {