From d159cce8494cca05219b8cc795af943e145d627a Mon Sep 17 00:00:00 2001 From: lzw <605106923@qq.com> Date: Tue, 12 Oct 2021 21:44:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Yi.Framework.Interface/IMenuService.cs | 2 +- .../Yi.Framework.Interface/IRoleService.cs | 1 + .../Yi.Framework.Service/MenuService.cs | 14 ++++++------- .../Yi.Framework.Service/MouldService.cs | 5 ++--- .../Yi.Framework.Service/RoleService.cs | 13 +++++++----- .../Yi.Framework.Service/UserService.cs | 21 ++++++++++++------- 6 files changed, 32 insertions(+), 24 deletions(-) diff --git a/Yi.Framework/Yi.Framework.Interface/IMenuService.cs b/Yi.Framework/Yi.Framework.Interface/IMenuService.cs index f4ceaba1..2b603862 100644 --- a/Yi.Framework/Yi.Framework.Interface/IMenuService.cs +++ b/Yi.Framework/Yi.Framework.Interface/IMenuService.cs @@ -20,7 +20,7 @@ namespace Yi.Framework.Interface Task GetMouldByMenu(menu _menu); /// - /// 通过menu得到他自己与mould（注意：确保返回的menu里含有menu） + /// 通过menu得到他自己与mould（注意：确保返回的menu里含有mould） /// /// /// diff --git a/Yi.Framework/Yi.Framework.Interface/IRoleService.cs b/Yi.Framework/Yi.Framework.Interface/IRoleService.cs index 337278de..6d9a47a7 100644 --- a/Yi.Framework/Yi.Framework.Interface/IRoleService.cs +++ b/Yi.Framework/Yi.Framework.Interface/IRoleService.cs @@ -33,5 +33,6 @@ namespace Yi.Framework.Interface /// /// Task SetMenusByRolesId(List menuIds, int roleId); + } } diff --git a/Yi.Framework/Yi.Framework.Service/MenuService.cs b/Yi.Framework/Yi.Framework.Service/MenuService.cs index 6c099dcd..275968ed 100644 --- a/Yi.Framework/Yi.Framework.Service/MenuService.cs +++ b/Yi.Framework/Yi.Framework.Service/MenuService.cs @@ -27,22 +27,22 @@ namespace Yi.Framework.Service public async Task> GetChildrenByMenu(menu _menu) { - var menu_data = await GetEntity(u=>u.id==_menu.id); - var childrenList = menu_data.children; - return (List)childrenList; + var menu_data = await GetEntity(u=>u.id==_menu.id&& u.is_delete == (short)Common.Enum.DelFlagEnum.Normal); + var childrenList = menu_data.children.ToList(); + return childrenList; } public async Task GetMenuMouldByMenu(menu _menu) { - var menu_data = await GetEntity(u => u.id == _menu.id); + var menu_data = await GetEntityById(_menu.id); return menu_data; } public async Task GetMouldByMenu(menu _menu) { - var menu_data = await GetEntity(u => u.id == _menu.id); - var mould_data =await _Db.Set().Include(u => u.menu).Where(u => u.menu == menu_data).FirstOrDefaultAsync(); - return mould_data; + var menu_data =await _Db.Set().Include(u => u.mould) + .Where(u => u.id == _menu.id & u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync(); + return menu_data.mould; } public async Task SetMouldByMenu(int mouldId, int menuId) diff --git a/Yi.Framework/Yi.Framework.Service/MouldService.cs b/Yi.Framework/Yi.Framework.Service/MouldService.cs index ba21cdce..1be110ae 100644 --- a/Yi.Framework/Yi.Framework.Service/MouldService.cs +++ b/Yi.Framework/Yi.Framework.Service/MouldService.cs @@ -27,9 +27,8 @@ namespace Yi.Framework.Service public async Task GetMenuByMould(mould _mould) { - var mould_data =await GetEntity(u => u.id ==_mould.id); - return await _Db.Set().Where(u => u.mould == mould_data).FirstOrDefaultAsync(); - //return mould_data.menu; + var mould_data= await _Db.Set().Include(u=>u.menu).Where(u => u.id == _mould.id&& u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync(); + return mould_data.menu; } } } diff --git a/Yi.Framework/Yi.Framework.Service/RoleService.cs b/Yi.Framework/Yi.Framework.Service/RoleService.cs index 6ce4f7d5..a51873bc 100644 --- a/Yi.Framework/Yi.Framework.Service/RoleService.cs +++ b/Yi.Framework/Yi.Framework.Service/RoleService.cs @@ -27,14 +27,17 @@ namespace Yi.Framework.Service } public async Task> GetMenusByRole(role _role) - { - return await _Db.Set().Include(u=>u.mould).ThenInclude(u=>u.menu) - .Where(u=>u.roles.Contains(_role)&& u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync(); + { + var role_data =await _Db.Set().Include(u => u.menus) + .Where(u => u.id == _role.id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync(); + return role_data.menus.ToList(); } public async Task> GetUsersByRole(role _role) { - return await _Db.Set().Where(u => u.roles.Contains(_role) && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync(); + var role_data = await _Db.Set().Include(u => u.users) + .Where(u => u.id == _role.id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync(); + return role_data.users.ToList(); } public async Task SetMenusByRolesId(List menuIds, int roleId) @@ -46,7 +49,7 @@ namespace Yi.Framework.Service } var menuList = _Db.Set().Where(u => menuIds.Contains(u.id)&&u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync(); - role_data.menus = (ICollection)menuList; + role_data.menus = (ICollection)menuList; return await AddAsync(role_data); } } diff --git a/Yi.Framework/Yi.Framework.Service/UserService.cs b/Yi.Framework/Yi.Framework.Service/UserService.cs index 728d7bd2..ea563c57 100644 --- a/Yi.Framework/Yi.Framework.Service/UserService.cs +++ b/Yi.Framework/Yi.Framework.Service/UserService.cs @@ -30,20 +30,24 @@ namespace Yi.Framework.Service public async Task> GetMenusByUser(user _user) { - return await _Db.Set().Include(u => u.roles).ThenInclude(u => u.menus) - .Where(u=>u.id==_user.id&& u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync(); + var user_data= await _Db.Set().Include(u => u.roles).ThenInclude(u => u.menus) + .Where(u=>u.id==_user.id&& u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync(); + var menuList= user_data.roles.Select(u => u.menus); + return (List)menuList; } public async Task> GetMouldByUser(user _user) - { - return await _Db.Set().Include(u => u.menu) - .Where(u => u.id == _user.id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync(); + { + var user_data = await GetEntity(u => u.id == _user.id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal); + var menu = await GetMenusByUser(user_data); + var mouldList = menu.Select(u=>u.mould); + return (List)mouldList; } public async Task> GetRolesByUser(user _user) { - return await _Db.Set().Include(u => u.users) - .Where(u => u.id == _user.id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync(); + var user_data = await GetEntity(u => u.id == _user.id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal); + return (List)user_data.roles; } public async Task Login(user _user) @@ -75,7 +79,8 @@ namespace Yi.Framework.Service { return false; } - var roleList = _Db.Set().Where(u => roleIds.Contains(u.id)).ToList(); + var roleList = _Db.Set().Where(u => roleIds.Contains(u.id)).ToList(); + user_data.roles = roleList; return await AddAsync(user_data); }