|
@@ -48,13 +48,13 @@ namespace Hotline.Repository.SqlSugar.System
|
|
|
{
|
|
|
//过滤已存在的
|
|
|
var menulist = await Db.Queryable<SystemMenu>()
|
|
|
- .Where(x => x.IsFast && perList.Contains(x.PermissionCode) && x.PageName.Contains(name) && x.MenuType == Share.Enums.Settings.EMenuType.Page).ToListAsync();
|
|
|
+ .Where(x => x.IsFast && perList.Contains(x.PermissionCode) && x.PageName.Contains(name) && x.MenuType == Share.Enums.Settings.EMenuType.Page && codes.Contains(x.PermissionCode)).ToListAsync();
|
|
|
return menulist;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
var menulist = await Db.Queryable<SystemMenu>()
|
|
|
- .Where(x => (x.IsFast && x.MenuType == Share.Enums.Settings.EMenuType.Page)).ToListAsync();
|
|
|
+ .Where(x => (x.IsFast && x.PageName.Contains(name) && x.MenuType == Share.Enums.Settings.EMenuType.Page && codes.Contains(x.PermissionCode))).ToListAsync();
|
|
|
return menulist;
|
|
|
}
|
|
|
|