|
@@ -18,6 +18,10 @@ namespace Hotline.Repository.SqlSugar.System
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
public async Task<IReadOnlyList<SystemMenu>> GetMyMenu(string[] roles)
|
|
public async Task<IReadOnlyList<SystemMenu>> GetMyMenu(string[] roles)
|
|
{
|
|
{
|
|
|
|
+ if (roles.Contains("sysadmin"))
|
|
|
|
+ {
|
|
|
|
+ return await Db.Queryable<SystemMenu>().OrderBy(x => x.DisplayOrder).ToTreeAsync(x => x.children, it => it.ParentId, "");
|
|
|
|
+ }
|
|
var list = await Db.Queryable<SystemAuthority>()
|
|
var list = await Db.Queryable<SystemAuthority>()
|
|
.Where(x => roles.Contains(x.RoleCode)).ToListAsync();
|
|
.Where(x => roles.Contains(x.RoleCode)).ToListAsync();
|
|
var menuarr = new List<string>();
|
|
var menuarr = new List<string>();
|
|
@@ -36,6 +40,10 @@ namespace Hotline.Repository.SqlSugar.System
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
public async Task<IReadOnlyList<string>> GetMyButton(string[] roles)
|
|
public async Task<IReadOnlyList<string>> GetMyButton(string[] roles)
|
|
{
|
|
{
|
|
|
|
+ if (roles.Contains("sysadmin"))
|
|
|
|
+ {
|
|
|
|
+ return await Db.Queryable<SystemButton>().Select(x => x.PermissionCode).ToListAsync();
|
|
|
|
+ }
|
|
var list = await Db.Queryable<SystemAuthority>()
|
|
var list = await Db.Queryable<SystemAuthority>()
|
|
.Where(x => roles.Contains(x.RoleCode)).ToListAsync();
|
|
.Where(x => roles.Contains(x.RoleCode)).ToListAsync();
|
|
var buttonarr = new List<string>();
|
|
var buttonarr = new List<string>();
|
|
@@ -53,6 +61,13 @@ namespace Hotline.Repository.SqlSugar.System
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
public IReadOnlyList<string> GetPermission(List<string> roles)
|
|
public IReadOnlyList<string> GetPermission(List<string> roles)
|
|
{
|
|
{
|
|
|
|
+ if (roles.Contains("sysadmin"))
|
|
|
|
+ {
|
|
|
|
+ var menucodelist = Db.Queryable<SystemMenu>().Select(x => x.PermissionCode).ToList();
|
|
|
|
+ var buttoncodelist = Db.Queryable<SystemButton>().Select(x => x.PermissionCode).ToList();
|
|
|
|
+ menucodelist.AddRange(buttoncodelist);
|
|
|
|
+ return menucodelist;
|
|
|
|
+ }
|
|
var list = Db.Queryable<SystemAuthority>()
|
|
var list = Db.Queryable<SystemAuthority>()
|
|
.Where(x => roles.Contains(x.RoleCode)).ToList();
|
|
.Where(x => roles.Contains(x.RoleCode)).ToList();
|
|
var permissionarr = new List<string>();
|
|
var permissionarr = new List<string>();
|