Showing the draft of self only

This commit is contained in:
ashutosh.nehete 2025-08-04 09:46:56 +05:30
parent 2ccae935f3
commit 2c94854f57
2 changed files with 11 additions and 0 deletions

View File

@ -47,6 +47,13 @@ namespace Marco.Pms.Helpers.CacheHelper
{ {
filter &= filterBuilder.Eq(e => e.CreatedBy.Id, loggedInEmployeeId.ToString()); filter &= filterBuilder.Eq(e => e.CreatedBy.Id, loggedInEmployeeId.ToString());
} }
else
{
filter &= filterBuilder.Or(
filterBuilder.Ne(e => e.CreatedBy.Id, loggedInEmployeeId.ToString()),
filterBuilder.Ne(e => e.Status.Id, "297e0d8f-f668-41b5-bfea-e03b354251c8")
);
}
// Apply filters // Apply filters

View File

@ -139,6 +139,10 @@ namespace Marco.Pms.Services.Service
_logger.LogInfo("User {EmployeeId} has 'View Self' permission. Restricting query to their expenses.", loggedInEmployeeId); _logger.LogInfo("User {EmployeeId} has 'View Self' permission. Restricting query to their expenses.", loggedInEmployeeId);
expensesQuery = expensesQuery.Where(e => e.CreatedById == loggedInEmployeeId); expensesQuery = expensesQuery.Where(e => e.CreatedById == loggedInEmployeeId);
} }
else
{
expensesQuery = expensesQuery.Where(e => e.CreatedById != loggedInEmployeeId || e.StatusId != Draft);
}
if (expenseFilter != null) if (expenseFilter != null)
{ {