From bd4f1d5e691a686827bfde483b7a77e65e100e0c Mon Sep 17 00:00:00 2001 From: "ashutosh.nehete" Date: Sat, 23 Aug 2025 11:42:11 +0530 Subject: [PATCH] Added the IsRoot user Field in employee profile VM --- Marco.Pms.Model/Mapper/EmployeeMapper.cs | 1 + Marco.Pms.Model/ViewModels/Employee/EmployeeVM.cs | 1 + Marco.Pms.Services/Helpers/EmployeeHelper.cs | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Marco.Pms.Model/Mapper/EmployeeMapper.cs b/Marco.Pms.Model/Mapper/EmployeeMapper.cs index 61bac16..b82bccc 100644 --- a/Marco.Pms.Model/Mapper/EmployeeMapper.cs +++ b/Marco.Pms.Model/Mapper/EmployeeMapper.cs @@ -35,6 +35,7 @@ namespace Marco.Pms.Model.Mapper PhoneNumber = model.PhoneNumber, Photo = base64String, IsActive = model.IsActive, + IsRootUser = model.ApplicationUser!.IsRootUser!.Value, IsSystem = model.IsSystem, JoiningDate = model.JoiningDate, TenantId = model.TenantId diff --git a/Marco.Pms.Model/ViewModels/Employee/EmployeeVM.cs b/Marco.Pms.Model/ViewModels/Employee/EmployeeVM.cs index 93e125a..c7eda37 100644 --- a/Marco.Pms.Model/ViewModels/Employee/EmployeeVM.cs +++ b/Marco.Pms.Model/ViewModels/Employee/EmployeeVM.cs @@ -21,6 +21,7 @@ public string? AadharNumber { get; set; } public bool IsActive { get; set; } = true; + public bool IsRootUser { get; set; } public string? PanNumber { get; set; } public string? Photo { get; set; } // To store the captured photo diff --git a/Marco.Pms.Services/Helpers/EmployeeHelper.cs b/Marco.Pms.Services/Helpers/EmployeeHelper.cs index 09dcbe2..d1dc50b 100644 --- a/Marco.Pms.Services/Helpers/EmployeeHelper.cs +++ b/Marco.Pms.Services/Helpers/EmployeeHelper.cs @@ -29,7 +29,7 @@ namespace MarcoBMS.Services.Helpers { var result = await _context.Employees.Where(c => c.ApplicationUserId == ApplicationUserID && c.IsActive == true).ToListAsync(); - return await _context.Employees.Where(c => c.ApplicationUserId == ApplicationUserID && c.IsActive == true).SingleOrDefaultAsync() ?? new Employee { }; + return await _context.Employees.Include(e => e.ApplicationUser).Where(c => c.ApplicationUserId == ApplicationUserID && c.ApplicationUser != null && c.IsActive == true).SingleOrDefaultAsync() ?? new Employee { }; } catch (Exception ex) {