From 73525db2e9898a5a0cd003ce0c51a1b7ba078d2d Mon Sep 17 00:00:00 2001 From: yeslode <605106923@qq.com> Date: Sun, 17 Oct 2021 23:17:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=8F=9C=E5=8D=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/MenuController.cs | 4 +++- .../Controllers/RoleController.cs | 5 +---- .../Yi.Framework.ApiMicroservice/YIDB.db | Bin 65536 -> 65536 bytes .../Yi.Framework.Interface/IMenuService.cs | 1 + .../Yi.Framework.Interface/IRoleService.cs | 2 +- .../Yi.Framework.Service/MenuService.cs | 3 ++- .../Yi.Framework.Service/RoleService.cs | 13 ++++++++----- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs index 1c4506ad..eab50a11 100644 --- a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs +++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs @@ -26,7 +26,9 @@ namespace Yi.Framework.ApiMicroservice.Controllers [HttpGet] public async Task GetMenu() { - return Result.Success().SetData(await _menuService.GetTopMenu()); + //var top =await _menuService.GetTopMenu(); + //var children=await _menuService.get + return Result.Success().SetData(await _menuService.GetTopMenu()); } /// diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs index a62cc81e..befb426c 100644 --- a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs +++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs @@ -71,10 +71,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers [HttpPost] public async Task SetMenuByRole(IdsListDto idsListDto) { - foreach(var id in idsListDto.ids1) - { - await _roleService.SetMenusByRolesId(idsListDto.ids2, id); - } + await _roleService.SetMenusByRolesId(idsListDto.ids2, idsListDto.ids1); return Result.Success(); } } diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db index 0e47b3b311b93b97bf9e208d1cfade99200fdb98..8173bcc19910ebb95860dc7e2158539b8ad73bf5 100644 GIT binary patch delta 1724 zcmai!U1%It7>3W8IkVZ>`FSUQn{1Qav)Roqtr%q!bCF&ZDn*J~5v*RQSX#v@qOnn- zQf37~t>}egrGlaer9#EFELtQtdf|nnTD5`~A*8`37GtW`R>4;A`_4wNHQDU2&&-*5 z-}9cIZ>C;X^}0HCW}B=w=C+;G(oH^me9HrFZFrRE0uoPSlz6%<`Yr%MMM{r{h`b(JfPx?pv{r-a+pf zZ@V|zXpiPHv95YTcjtsmr-gWI*Y2S`6FZ)qn0Ro{#KK1}pF4UWt1HU_cVz+eU~567 z%c~1w&L~w%tf&b2|BMrp^ZVcZ@%8r?UOW*M2Uym(lFW>CIMT({qnfkPR}126=bJAT zSfN)9sSVZg#eD05)S&yX&bc-w(tSn{ubLC-b!&CeyOyA*wII~lxU~YhyR{(FU26$C zTM4R14@A17m4XD7_T=wdU!}A0HT7UA7jg9ds zpg+9{LZq-$_!*CzO+m^}b1T^tmqXwE?}KDK-dZf={tcsUR(Ok&>3BovU{2sNF5x`R zVXo0$KZTm(*it%5DchCGvAJO>iyD?KZP(3Erh^%_UBoL{aE$};j zz%(CZ`~tBFA!GBb*qSCQg-TcEtYtHus#q^@1%KiKmT0D*ViF(YIG(2NX7D|}!4y8n z5gfvEcmen02E2nek>C|Pizo01c3}%P;U?UQ^|%LjVk31)zeZ2=RT%SfWvfh7n9(4! zR5sTo!vSWt$jocQ0uy;=)Nj~lxK7zZ=FDX;Gwfj^YwmO#b{TdWb~tu&_|$!N6`PZ` zugllrFy6!4I7nlE6))j=#Mq0cXbz9!A?(1txSK|Q8-1oX)2H^Aa5tw_85PDLqs%BV z1{g(#W)v8CMn9vE(Ht&c^)h-GwEjYNGrAa^jE>}k*}K~D8|~t}plw*B%AtdH@ic~b uCXT5A+QBO#rED%e-aXYUwzIr@ALgpc!pQ8fyA)3asJZc}`v+r(@7 zhIJYm@ilu15zDC-*4bD`LtNJg03xY`M59rrYZ|ea%`TnQ0j7!B=+=K#W^H0H6XG}` z+_`UesEB9A{MNzm4Ym`aGBuH0oSUCb&LonNUZ*}CtcqeLq*9a#swn5p;WMml23r*> zGl|NQ%p6mScUyn2>47Gf!X$}OMPZB?wxg#e^}C#qf7oNAi5$TvKJbPYJmVNgIK)04 zafe%6;~b~hM$Vd43LW94hvcm6~mr)*#z~WGnCw DFtBRu diff --git a/Yi.Framework/Yi.Framework.Interface/IMenuService.cs b/Yi.Framework/Yi.Framework.Interface/IMenuService.cs index 98ea93d7..1c77e4b2 100644 --- a/Yi.Framework/Yi.Framework.Interface/IMenuService.cs +++ b/Yi.Framework/Yi.Framework.Interface/IMenuService.cs @@ -60,5 +60,6 @@ namespace Yi.Framework.Interface /// /// Task> GetChildrenMenu(menu _menu); + } } diff --git a/Yi.Framework/Yi.Framework.Interface/IRoleService.cs b/Yi.Framework/Yi.Framework.Interface/IRoleService.cs index a8295ddb..e06f3337 100644 --- a/Yi.Framework/Yi.Framework.Interface/IRoleService.cs +++ b/Yi.Framework/Yi.Framework.Interface/IRoleService.cs @@ -32,7 +32,7 @@ namespace Yi.Framework.Interface /// /// /// - Task SetMenusByRolesId(List menuIds, int roleId); + Task SetMenusByRolesId(List menuIds, List roleIds); } } diff --git a/Yi.Framework/Yi.Framework.Service/MenuService.cs b/Yi.Framework/Yi.Framework.Service/MenuService.cs index 4af787c7..f67047a4 100644 --- a/Yi.Framework/Yi.Framework.Service/MenuService.cs +++ b/Yi.Framework/Yi.Framework.Service/MenuService.cs @@ -13,10 +13,11 @@ namespace Yi.Framework.Service { public MenuService(DbContext Db) : base(Db) { } + public async Task AddChildrenMenu(menu _menu, menu _children) { var menu_data = await _Db.Set().Include(u => u.children).Where(u => u.id == _menu.id).FirstOrDefaultAsync(); - _children.is_top = (short)Common.Enum.TopFlagEnum.Children; + _children.is_top = (short)Common.Enum.TopFlagEnum.Children; menu_data.children.Add(_children); await UpdateAsync(menu_data); return menu_data; diff --git a/Yi.Framework/Yi.Framework.Service/RoleService.cs b/Yi.Framework/Yi.Framework.Service/RoleService.cs index e0e38b50..8d355ac1 100644 --- a/Yi.Framework/Yi.Framework.Service/RoleService.cs +++ b/Yi.Framework/Yi.Framework.Service/RoleService.cs @@ -42,17 +42,20 @@ namespace Yi.Framework.Service return role_data.users.ToList(); } - public async Task SetMenusByRolesId(List menuIds, int roleId) + public async Task SetMenusByRolesId(List menuIds,List roleIds) { - var role_data = await GetEntity(u => u.id == roleId && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal); + var role_data = await _Db.Set().Include(u=>u.menus) + .Where(u =>roleIds.Contains(u.id) && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync(); if (role_data == null) { return false; } var menuList = await _Db.Set().Where(u => menuIds.Contains(u.id)&&u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync(); - - role_data.menus =menuList; - return await AddAsync(role_data); + foreach(var role in role_data) + { + role.menus =menuList; + } + return await UpdateListAsync(role_data); } } }