xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新菜单控制器

Browse Source
This commit is contained in:
lzw
2021-10-15 21:50:42 +08:00
parent cbfb19ade8
commit 030d5c6b50
6 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs
View File

@@ -100,7 +100,12 @@ namespace Yi.Framework.ApiMicroservice.Controllers
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<Result> AddChildrenMenu(ChildrenDto<menu> childrenDto) public async Task<Result> AddChildrenMenu(ChildrenDto<menu> childrenDto)
{ {
var _menu = await _menuService.GetEntityById(childrenDto.parentId);
var _children= await _menuService.AddChildrenMenu(_menu);
_children = childrenDto.data;
return Result.Success();
} }
} }
} }

3
Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
View File

@@ -92,8 +92,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
[HttpPost] [HttpPost]
public async Task<Result> SetRoleByUser(IdsListDto<int> idsListDto) public async Task<Result> SetRoleByUser(IdsListDto<int> idsListDto)
{ {
有bug：无法运行，500报错;
var _user = this.HttpContext.GetCurrentUserInfo();
await _userService.SetRolesByUser(idsListDto.ids2, idsListDto.ids1); await _userService.SetRolesByUser(idsListDto.ids2, idsListDto.ids1);
return Result.Success(); return Result.Success();
} }

BIN
Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db
View File

Binary file not shown.

2
Yi.Framework/Yi.Framework.Interface/IMenuService.cs
View File

@@ -45,6 +45,6 @@ namespace Yi.Framework.Interface
/// </summary> /// </summary>
/// <param name="_menu"></param> /// <param name="_menu"></param>
/// <returns></returns> /// <returns></returns>
Task<bool> AddChildrenMenu(menu _menu); Task<menu> AddChildrenMenu(menu _menu);
} }
} }

15
Yi.Framework/Yi.Framework.Service/MenuService.cs
View File

@@ -13,15 +13,14 @@ namespace Yi.Framework.Service
{ {
public MenuService(DbContext Db) : base(Db) { } public MenuService(DbContext Db) : base(Db) { }
public async Task<bool> AddChildrenMenu(menu _menu) public async Task<menu> AddChildrenMenu(menu _menu)
{ {
var menu_data = await GetEntity(u=>u.id==_menu.id&& u.is_delete == (short)Common.Enum.DelFlagEnum.Normal); var menu_data = await _Db.Set<menu>().Include(u=>u.children)
if (menu_data == null) .Where(u=>u.id==_menu.id&& u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync();
{ var _children = menu_data.children.ToList();
return false; _children.Add(new menu());
} await UpdateAsync(menu_data);
menu_data.children.Add(new menu()) ; return menu_data;
return await AddAsync(_menu);
} }
public async Task<bool> DelListByUpdateAsync(List<int> _ids) public async Task<bool> DelListByUpdateAsync(List<int> _ids)

2
Yi.Framework/Yi.Framework.Service/UserService.cs
View File

@@ -92,7 +92,7 @@ namespace Yi.Framework.Service
{ {
return false; return false;
} }
var roleList = _Db.Set<role>().Where(u => roleIds.Contains(u.id)).ToList(); var roleList =await _Db.Set<role>().Where(u => roleIds.Contains(u.id) && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync();
foreach(var item in user_data) foreach(var item in user_data)
{ {
item.roles = roleList; item.roles = roleList;