用户角色菜单数据对应

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml

@@ -141,6 +141,13 @@
             菜单管理
             </summary>
         </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.MenuController.GetList(Yi.Framework.Model.Models.MenuEntity)">
+            <summary>
+            动态条件查询全部
+            </summary>
+            <param name="menu"></param>
+            <returns></returns>
+        </member>
         <member name="M:Yi.Framework.ApiMicroservice.Controllers.MenuController.GetMenuTree">
             <summary>
             得到树形菜单
@@ -152,6 +159,12 @@
             角色管理
             </summary>
         </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.RoleController.PageList(Yi.Framework.Model.Models.RoleEntity,Yi.Framework.Common.Models.PageParModel)">
+            <summary>
+            动态条件分页查询
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Yi.Framework.ApiMicroservice.Controllers.RoleController.GiveRoleSetMenu(Yi.Framework.DTOModel.GiveRoleSetMenuDto)">
             <summary>
             给多用户设置多角色

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs

@@ -20,7 +20,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
     /// </summary>
     [ApiController]
     [Route("api/[controller]/[action]")]
-    public class MenuController 
+    public class MenuController
     {
         private IMenuService _iMenuService;
         public MenuController(ILogger<MenuEntity> logger, IMenuService iMenuService)
@@ -28,10 +28,16 @@ namespace Yi.Framework.ApiMicroservice.Controllers
             _iMenuService = iMenuService;
         }
 
+
+        /// <summary>
+        /// 动态条件查询全部
+        /// </summary>
+        /// <param name="menu"></param>
+        /// <returns></returns>
         [HttpGet]
-        public async Task<Result> GetList()
+        public async Task<Result> GetList([FromQuery] MenuEntity menu)
         {
-            return Result.Success().SetData(await _iMenuService._repository.GetListAsync());
+            return Result.Success().SetData(await _iMenuService.SelctGetList(menu));
         }
 
 
@@ -41,8 +47,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// <returns></returns>
         [HttpGet]
         public async Task<Result> GetMenuTree()
-        { 
-             return Result.Success().SetData(await _iMenuService. GetMenuTreeAsync());
+        {
+            return Result.Success().SetData(await _iMenuService.GetMenuTreeAsync());
         }
     }
 }

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs

@@ -29,12 +29,17 @@ namespace Yi.Framework.ApiMicroservice.Controllers
             _iRoleService = iRoleService;
         }
 
+        /// <summary>
+        /// 动态条件分页查询
+        /// </summary>
+        /// <returns></returns>
         [HttpGet]
-        public async Task<Result> PageList()
+        public async Task<Result> PageList([FromQuery] RoleEntity role, [FromQuery] PageParModel page)
         {
-            return Result.Success().SetData(await _iRoleService._repository.GetListAsync());
+            return Result.Success().SetData(await _iRoleService.SelctPageList(role, page));
         }
 
+
         /// <summary>
         /// 给多用户设置多角色
         /// </summary>