Fixing can't assign role

Create-Peace · Feb 24, 2023 · 5e25418 · 5e25418
1 parent 0c4ae19
commit 5e25418
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/DncZeus.Api/Controllers/Api/V1/Rbac/RoleController.cs b/DncZeus.Api/Controllers/Api/V1/Rbac/RoleController.cs
@@ -310,16 +310,14 @@ public IActionResult FindListByUserGuid(Guid guid)
                 //    x.DncRole.Code,
                 //    x.DncRole.Name
                 //});
-                var userGuid = AuthContextService.CurrentUser.Guid;
 
                 var query = from urm in _dbContext.DncUserRoleMapping
                             join r in _dbContext.DncRole on urm.RoleCode equals r.Code
-                            where urm.UserGuid == userGuid
-                            select r;
+                            where urm.UserGuid == guid
+                            select new { r.Code };
 
                 var assignedRoles = query.Select(x => x.Code).ToList();
-                var roles = _dbContext.DncRole.Where(x =>
-                        x.IsDeleted == CommonEnum.IsDeleted.No && x.Status == CommonEnum.Status.Normal)
+                var roles = _dbContext.DncRole.Where(x => x.IsDeleted == CommonEnum.IsDeleted.No && x.Status == CommonEnum.Status.Normal && !x.IsSuperAdministrator)
                     .Select(x => new { label = x.Name, key = x.Code })
                     .ToList();
                 response.SetData(new { roles, assignedRoles });

diff --git a/DncZeus.Api/Controllers/Api/V1/Rbac/UserController.cs b/DncZeus.Api/Controllers/Api/V1/Rbac/UserController.cs
@@ -51,7 +51,7 @@ public IActionResult List(UserRequestPayload payload)
         {
             using (_dbContext)
             {
-                var query = _dbContext.DncUser.AsQueryable();
+                var query = _dbContext.DncUser.Where(x => x.UserType != UserType.SuperAdministrator);
                 if (!string.IsNullOrEmpty(payload.Kw))
                 {
                     query = query.Where(x => x.LoginName.Contains(payload.Kw.Trim()) || x.DisplayName.Contains(payload.Kw.Trim()));

diff --git a/DncZeus.Api/ViewModels/Rbac/DncUser/SaveUserRolesViewModel.cs b/DncZeus.Api/ViewModels/Rbac/DncUser/SaveUserRolesViewModel.cs
@@ -7,8 +7,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace DncZeus.Api.ViewModels.Rbac.DncUser
 {