From f2921ecc7a72391ca3c7e79596ec1860c5dc8be0 Mon Sep 17 00:00:00 2001 From: kotcheshir73 Date: Sat, 3 Apr 2021 07:55:47 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BB=D0=B8=D1=88=D0=BD=D0=B5=D0=B5=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BB=D0=B5=20=D1=83=20=D0=B4=D0=BE=D1=81=D1=82=D1=83?= =?UTF-8?q?=D0=BF=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=B2=D1=8B=D0=B1=D0=BE?= =?UTF-8?q?=D1=80=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BindingModels/AccessBindingModels.cs | 4 +--- .../Implementations/AccessService.cs | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/AccessBindingModels.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/AccessBindingModels.cs index 7686133..3632eb2 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/AccessBindingModels.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BindingModels/AccessBindingModels.cs @@ -11,12 +11,10 @@ namespace SecurityBusinessLogic.BindingModels /// public class AccessGetBindingModel : GetBindingModel { - public Guid? RoleId { get; set; } - /// /// Для вывода списка доступов по роли в контроле десктопном /// - public string RoleName { get; set; } + public Guid? RoleId { get; set; } } /// diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AccessService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AccessService.cs index b32508b..0850fdf 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AccessService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AccessService.cs @@ -87,10 +87,6 @@ namespace SecurityDatabaseImplementation.Implementations { query = query.Where(x => x.RoleId == model.RoleId); } - if(model.RoleName.IsNotEmpty()) - { - query = query.Where(x => x.Role.RoleName == model.RoleName); - } query = query.OrderBy(x => x.Role.RoleName).ThenBy(x => x.AccessOperation).ThenBy(x => x.AccessType);