Sfoglia il codice sorgente

😁获取当前账号信息时增加角色集合

zuohuaijun 2 anni fa
parent
commit
67c08da8b6

+ 5 - 0
Admin.NET/Admin.NET.Core/Service/Auth/Dto/LoginUserOutput.cs

@@ -78,4 +78,9 @@ public class LoginUserOutput
     /// 按钮权限集合
     /// </summary>
     public List<string> Buttons { get; set; }
+
+    /// <summary>
+    /// 角色集合
+    /// </summary>
+    public List<long> RoleIds { get; set; }
 }

+ 5 - 1
Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs

@@ -176,6 +176,9 @@ public class SysAuthService : IDynamicApiController, ITransient
         var pos = await _sysUserRep.ChangeRepository<SqlSugarRepository<SysPos>>().GetFirstAsync(u => u.Id == user.PosId);
         // 获取拥有按钮权限集合
         var buttons = await _sysMenuService.GetOwnBtnPermList();
+        // 获取权限集合
+        var roleIds = await _sysUserRep.ChangeRepository<SqlSugarRepository<SysUserRole>>().AsQueryable()
+            .Where(u => u.UserId == user.Id).Select(u => u.RoleId).ToListAsync();
 
         return new LoginUserOutput
         {
@@ -190,7 +193,8 @@ public class SysAuthService : IDynamicApiController, ITransient
             OrgName = org?.Name,
             OrgType = org?.Type,
             PosName = pos?.Name,
-            Buttons = buttons
+            Buttons = buttons,
+            RoleIds = roleIds
         };
     }
 

+ 1 - 1
Web/src/stores/userInfo.ts

@@ -73,7 +73,7 @@ export const useUserInfo = defineStore('userInfo', {
 							orgId: d.orgId,
 							orgName: d.orgName,
 							posName: d.posName,
-							roles: [],
+							roles: d.roleIds,
 							authBtnList: d.buttons,
 							time: new Date().getTime(),
 						};