diff --git a/Marco.Pms.Services/Controllers/EmployeeController.cs b/Marco.Pms.Services/Controllers/EmployeeController.cs index d515660..d83a27e 100644 --- a/Marco.Pms.Services/Controllers/EmployeeController.cs +++ b/Marco.Pms.Services/Controllers/EmployeeController.cs @@ -32,7 +32,7 @@ namespace MarcoBMS.Services.Controllers private readonly IConfiguration _configuration; - public EmployeeController(UserManager userManager, IEmailSender emailSender, + public EmployeeController(UserManager userManager, IEmailSender emailSender, ApplicationDbContext context, EmployeeHelper employeeHelper, UserHelper userHelper, IConfiguration configuration) { _context = context; @@ -109,10 +109,11 @@ namespace MarcoBMS.Services.Controllers _context.EmployeeRoleMappings.Add(mapping); } - else + else if (role.IsEnabled == false) { - _context.EmployeeRoleMappings.Update(mapping); + _context.EmployeeRoleMappings.Remove(existingItem); } + } await _context.SaveChangesAsync(); } @@ -296,7 +297,7 @@ namespace MarcoBMS.Services.Controllers else { // Create Employee record if missing - Employee newEmployee = GetNewEmployeeModel(model, TenantId, null); + Employee newEmployee = GetNewEmployeeModel(model, TenantId, null); _context.Employees.Add(newEmployee); } @@ -304,7 +305,7 @@ namespace MarcoBMS.Services.Controllers responsemessage = "User created successfully."; } - return Ok(ApiResponse.SuccessResponse("Success.",responsemessage, 200)); + return Ok(ApiResponse.SuccessResponse("Success.", responsemessage, 200)); } #nullable disable private static Employee GetNewEmployeeModel(CreateUserDto model, int TenantId, string ApplicationUserId)