solved the mearge error

This commit is contained in:
ashutosh.nehete 2025-07-24 17:28:27 +05:30
parent 36163e97cc
commit 62956d6b12

View File

@ -740,7 +740,7 @@ namespace Marco.Pms.Services.Helpers
{ {
Guid tenantId = _userHelper.GetTenantId(); Guid tenantId = _userHelper.GetTenantId();
var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
var hasAdminPermission = await _permissionServices.HasPermission(directoryAdmin, LoggedInEmployee.Id); var hasAdminPermission = await _permissionServices.HasPermission(PermissionsMaster.DirectoryAdmin, LoggedInEmployee.Id);
if (id != Guid.Empty) if (id != Guid.Empty)
{ {
Contact? contact = await _context.Contacts.Include(c => c.ContactCategory).Include(c => c.CreatedBy).FirstOrDefaultAsync(c => c.Id == id && c.IsActive); Contact? contact = await _context.Contacts.Include(c => c.ContactCategory).Include(c => c.CreatedBy).FirstOrDefaultAsync(c => c.Id == id && c.IsActive);