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

Merge branch 'main' of https://github.com/ccnetcore/Yi into main

Browse Source
This commit is contained in:
lzw
2021-10-16 17:57:24 +08:00
parent 0860e05d17 dc244c7982
commit bc6796e3a6
16 changed files with 288 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Yi.Framework/Yi.Framework.ApiMicroservice/SwaggerDoc.xml
View File

@@ -66,6 +66,13 @@
</summary>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.MenuController.AddChildrenMenu(Yi.Framework.DTOModel.ChildrenDto{Yi.Framework.Model.Models.menu})">
<summary>
给一个菜单添加子节点（注意：添加，不是覆盖）
</summary>
<param name="childrenDto"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.MouldController.UpdateMould(Yi.Framework.Model.Models.mould)">
<summary>
更

4
Yi.Framework/Yi.Framework.Service/RoleService.cs
View File

@@ -47,9 +47,9 @@ namespace Yi.Framework.Service
{
return false;
}
var menuList = _Db.Set<menu>().Where(u => menuIds.Contains(u.id)&&u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync();
var menuList = await _Db.Set<menu>().Where(u => menuIds.Contains(u.id)&&u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync();
role_data.menus = (ICollection<menu>)menuList;
role_data.menus =menuList;
return await AddAsync(role_data);
}
}