admin/marco.pms.api
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Sloved issues of permissions not been assigned when updating the subscription #144

Merged
ashutosh.nehete merged 1 commits from Ashutosh_Bug#1461 into main 2025-10-10 08:49:19 +00:00
Conversation 0 Commits 1 Files Changed 1 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bb2c098cb9 - Show all commits

4
Marco.Pms.Services/Controllers/TenantController.cs
View File

@ -1069,7 +1069,7 @@ namespace Marco.Pms.Services.Controllers
// Get root employee and role for this tenant // Get root employee and role for this tenant
var rootEmployee = await _context.Employees var rootEmployee = await _context.Employees
.Include(e => e.ApplicationUser) .Include(e => e.ApplicationUser)
.FirstOrDefaultAsync(e => e.ApplicationUser != null && (e.ApplicationUser.IsRootUser ?? false) && e.TenantId == model.TenantId); .FirstOrDefaultAsync(e => e.ApplicationUser != null && (e.ApplicationUser.IsRootUser ?? false) && e.OrganizationId == tenant.OrganizationId);
if (rootEmployee == null) if (rootEmployee == null)
{ {
@ -1363,7 +1363,7 @@ namespace Marco.Pms.Services.Controllers
// 8c. Find root employee & role for this tenant. // 8c. Find root employee & role for this tenant.
var rootEmployee = await context.Employees var rootEmployee = await context.Employees
.Include(e => e.ApplicationUser) .Include(e => e.ApplicationUser)
.FirstOrDefaultAsync(e => e.ApplicationUser != null && (e.ApplicationUser.IsRootUser ?? false) && e.TenantId == model.TenantId); .FirstOrDefaultAsync(e => e.ApplicationUser != null && (e.ApplicationUser.IsRootUser ?? false) && e.OrganizationId == tenant.OrganizationId);
if (rootEmployee == null) if (rootEmployee == null)
{ {