|
@@ -145,7 +145,15 @@ namespace GxPress.Service.Implement.Role
|
|
|
{
|
|
|
using (var transactionScope = new TransactionScope())
|
|
|
{
|
|
|
- foreach (var item in models)
|
|
|
+ //查询所用的菜单
|
|
|
+ var menus = await GetMenusAllAsync();
|
|
|
+
|
|
|
+ foreach (var menu in models)
|
|
|
+ {
|
|
|
+ if (!menus.Any(n => n.Path == menu.Path && n.Name == menu.Name))
|
|
|
+ menu.IsUp = true;
|
|
|
+ }
|
|
|
+ foreach (var item in models.Where(n => n.IsUp == true))
|
|
|
{
|
|
|
var menuEntity = new Entity.Menus.Menus()
|
|
|
{
|
|
@@ -209,8 +217,8 @@ namespace GxPress.Service.Implement.Role
|
|
|
var models = await systemRoleMenusRepository.GetAllAsync(roleId);
|
|
|
var item = await menusRepository.GetAllAsync(models.Select(n => n.MenuId).ToList());
|
|
|
var result = new List<MenuInResult>();
|
|
|
- result = item.Select(n=>_mapper.Map<MenuInResult>(n)).ToList();
|
|
|
-
|
|
|
+ result = item.Select(n => _mapper.Map<MenuInResult>(n)).ToList();
|
|
|
+
|
|
|
return result;
|
|
|
}
|
|
|
|