fix 没有选中菜单仍旧显示应用的问题

This commit is contained in:
2021-05-26 14:37:39 +08:00
parent 2815bf8407
commit c833d4a1f4

View File

@@ -114,7 +114,11 @@ namespace Ewide.Core.Service
Target = u.OpenType == (int)MenuOpenType.OUTER ? "_blank" : "" Target = u.OpenType == (int)MenuOpenType.OUTER ? "_blank" : ""
} }
}).ToList(); }).ToList();
#if DEBUG
#else
await _sysCacheService.SetMenu(userId, appCode, antDesignTreeNodes); // 缓存结果 await _sysCacheService.SetMenu(userId, appCode, antDesignTreeNodes); // 缓存结果
#endif
} }
return antDesignTreeNodes; return antDesignTreeNodes;
} }
@@ -129,9 +133,11 @@ namespace Ewide.Core.Service
{ {
var roleIdList = await _sysUserRoleService.GetUserRoleIdList(userId); var roleIdList = await _sysUserRoleService.GetUserRoleIdList(userId);
var menuIdList = await _sysRoleMenuService.GetRoleMenuIdList(roleIdList); var menuIdList = await _sysRoleMenuService.GetRoleMenuIdList(roleIdList);
return await _sysMenuRep.DetachedEntities.Where(u => menuIdList.Contains(u.Id)) return await _sysMenuRep.DetachedEntities
.Where(u => u.Status == (int)CommonStatus.ENABLE) .Where(u => u.VisibleParent)
.Select(u => u.Application).ToListAsync(); .Where(u => menuIdList.Contains(u.Id))
.Where(u => u.Status == (int)CommonStatus.ENABLE)
.Select(u => u.Application).ToListAsync();
} }
/// <summary> /// <summary>