From 5b091a8d6f1eb39d61cca378d77331710b451a3a Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Mon, 28 Jul 2025 11:18:26 +0530
Subject: [PATCH] Rewrite the uf condiotn in get expense details API

---
 Marco.Pms.Services/Service/ExpensesService.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Marco.Pms.Services/Service/ExpensesService.cs b/Marco.Pms.Services/Service/ExpensesService.cs
index eadea99..c838aab 100644
--- a/Marco.Pms.Services/Service/ExpensesService.cs
+++ b/Marco.Pms.Services/Service/ExpensesService.cs
@@ -1191,12 +1191,7 @@ namespace Marco.Pms.Services.Service
             if (statusMapping != null)
             {
                 response.Status = _mapper.Map<ExpensesStatusMasterVM>(statusMapping.Status);
-                if (response.Status == null)
-                {
-                    var status = statusTask.Result;
-                    response.Status = _mapper.Map<ExpensesStatusMasterVM>(status);
-                }
-                response.Status.PermissionIds = permissionStatusMappings.Where(ps => ps.StatusId == Guid.Parse(model.StatusId)).Select(ps => ps.PermissionIds).FirstOrDefault();
+
                 response.NextStatus = _mapper.Map<List<ExpensesStatusMasterVM>>(statusMapping.NextStatus);
                 if (response.NextStatus != null)
                 {
@@ -1206,6 +1201,12 @@ namespace Marco.Pms.Services.Service
                     }
                 }
             }
+            if (response.Status == null)
+            {
+                var status = statusTask.Result;
+                response.Status = _mapper.Map<ExpensesStatusMasterVM>(status);
+            }
+            response.Status.PermissionIds = permissionStatusMappings.Where(ps => ps.StatusId == Guid.Parse(model.StatusId)).Select(ps => ps.PermissionIds).FirstOrDefault();
 
             foreach (var document in model.Documents)
             {