From bfa1eacb2743e268ef54c127da685e4dff83e7df Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 26 Jan 2021 15:47:06 +0800 Subject: [PATCH] update Former-commit-id: d6b3309683b12cdbd396fe32da16c60abc5f812b Former-commit-id: 4e8e322b45047d67719ec26eadbcdf6453ead676 --- .../Areas/Admin/Views/Shared/_Menu.cshtml | 38 +++---- .../Areas/IoTCenter/Views/Shared/_Menu.cshtml | 99 +++++++++---------- projects/Platform/Data/PlatformDbContext.cs | 6 +- 3 files changed, 67 insertions(+), 76 deletions(-) diff --git a/projects/Platform/Areas/Admin/Views/Shared/_Menu.cshtml b/projects/Platform/Areas/Admin/Views/Shared/_Menu.cshtml index e109451b..94dee55f 100644 --- a/projects/Platform/Areas/Admin/Views/Shared/_Menu.cshtml +++ b/projects/Platform/Areas/Admin/Views/Shared/_Menu.cshtml @@ -11,41 +11,35 @@ { var numbers = User.Claims.Where(o => o.Type == ClaimTypes.Role).Select(o => o.Value).ToList(); var permissions = module.PermissionCategories.SelectMany(o => o.Permissions).Where(o => numbers.Contains(o.Number)).OrderBy(o => o.Category.Order); - var platformPermissions = permissions.Where(o => !o.Hide && o.Type == PermissionType.Platform); + var platformPermissions = permissions.Where(o => !o.Hide && o.Type == PermissionType.Platform && o.Number.StartsWith("Read-")); if (platformPermissions.Any()) {
  • 全部机构
    • @foreach (var permission in platformPermissions) { - if (permission.Number.StartsWith("Read-")) - { - var name = permission.Category.Name; -
  • - - -

    @(name.Length>2?name:$"{name}管理")

    -     -
    • - } + var name = permission.Category.Name; +
  • + + +

    @(name.Length>2?name:$"{name}管理")

    +     +
    • } } - var organPermissions = permissions.Where(o => !o.Hide && o.Type == PermissionType.Organ); + var organPermissions = permissions.Where(o => !o.Hide && o.Type == PermissionType.Organ && o.Number.StartsWith("Read-")); if (organPermissions.Any()) {
  • 当前机构
    • @foreach (var permission in organPermissions) { var name = permission.Category.Name; - if (permission.Number.StartsWith("Read-")) - { - var controller = $"Organ{permission.Category.Number}"; -
  • - - -

    @(name.Length>2?name:$"{name}管理")

    -     -
    • - } + var controller = $"Organ{permission.Category.Number}"; +
  • + + +

    @(name.Length>2?name:$"{name}管理")

    +     +
    • } } } diff --git a/projects/Platform/Areas/IoTCenter/Views/Shared/_Menu.cshtml b/projects/Platform/Areas/IoTCenter/Views/Shared/_Menu.cshtml index cfd1677f..94dee55f 100644 --- a/projects/Platform/Areas/IoTCenter/Views/Shared/_Menu.cshtml +++ b/projects/Platform/Areas/IoTCenter/Views/Shared/_Menu.cshtml @@ -1,55 +1,48 @@ -