From 612f0b0f76b9b93afddf355898d53c5143d84fb8 Mon Sep 17 00:00:00 2001
From: yanghongwei <hongwei7458@163.com>
Date: Thu, 30 May 2024 22:04:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 langguanApi.xml                           | 13 +++++++++----
 langguanApi/Controllers/MenuController.cs |  5 ++---
 langguanApi/Service/MenuService.cs        | 19 ++++++-------------
 langguanApi/Service/OrganizedService.cs   |  2 ++
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/langguanApi.xml b/langguanApi.xml
index 278c917..1c9b804 100644
--- a/langguanApi.xml
+++ b/langguanApi.xml
@@ -177,11 +177,10 @@
             菜单服务
             </summary>
         </member>
-        <member name="M:langguanApi.Controllers.MenuController.List(langguanApi.Model.reqpage)">
+        <member name="M:langguanApi.Controllers.MenuController.List">
             <summary>
             获取菜单列表
             </summary>
-            <param name="input"></param>
             <returns></returns>
         </member>
         <member name="M:langguanApi.Controllers.MenuController.Add(langguanApi.Model.Entity.AddMenuDto)">
@@ -1793,11 +1792,17 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:langguanApi.Service.MenuService.Pager(langguanApi.Model.reqpage)">
+        <member name="M:langguanApi.Service.MenuService.GetMenuTree">
             <summary>
             获取菜单树
             </summary>
-            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:langguanApi.Service.MenuService.GetChildList(System.String)">
+            <summary>
+            递归获取子菜单列表
+            </summary>
+            <param name="parentId"></param>
             <returns></returns>
         </member>
         <member name="T:langguanApi.Service.OrganizedService">
diff --git a/langguanApi/Controllers/MenuController.cs b/langguanApi/Controllers/MenuController.cs
index 49cff20..155009b 100644
--- a/langguanApi/Controllers/MenuController.cs
+++ b/langguanApi/Controllers/MenuController.cs
@@ -24,12 +24,11 @@ namespace langguanApi.Controllers
         /// <summary>
         /// 获取菜单列表
         /// </summary>
-        /// <param name="input"></param>
         /// <returns></returns>
         [HttpGet("list")]
-        public async Task<IActionResult> List([FromQuery] reqpage input)
+        public async Task<IActionResult> List()
         {
-            var result = await _menuService.Pager(input);
+            var result = await _menuService.GetMenuTree();
             return Ok(result);
         }
         /// <summary>
diff --git a/langguanApi/Service/MenuService.cs b/langguanApi/Service/MenuService.cs
index adfd2f4..7016d1a 100644
--- a/langguanApi/Service/MenuService.cs
+++ b/langguanApi/Service/MenuService.cs
@@ -34,15 +34,14 @@ namespace langguanApi.Service
         /// <summary>
         /// 获取菜单树
         /// </summary>
-        /// <param name="input"></param>
         /// <returns></returns>
-        public async Task<ApiResult> Pager(reqpage input)
+        public async Task<ApiResult> GetMenuTree()
         {
-            Expression<Func<Menu, bool>> exp = filter => filter.IsDelete == false;
-            if (!string.IsNullOrEmpty(input.key))
-            {
-                exp = exp.And(filter => filter.Name.Contains(input.key));
-            }
+            //Expression<Func<Menu, bool>> exp = filter => filter.IsDelete == false;
+            //if (!string.IsNullOrEmpty(input.key))
+            //{
+            //    exp = exp.And(filter => filter.Name.Contains(input.key));
+            //}
             List<MenuTreeDto> dto = new List<MenuTreeDto>();
             var MenuList = await GetChildList(null);
             foreach (var item in MenuList)
@@ -58,12 +57,6 @@ namespace langguanApi.Service
                 });
             }
             return new ApiResult() { data = dto };
-
-            //return await base.GetPager(new ReqPaing()
-            //{
-            //    pageSize = input.pageSize,
-            //    current = input.current
-            //}, exp);
         }
         /// <summary>
         /// 递归获取子菜单列表
diff --git a/langguanApi/Service/OrganizedService.cs b/langguanApi/Service/OrganizedService.cs
index 2da0ef7..782c277 100644
--- a/langguanApi/Service/OrganizedService.cs
+++ b/langguanApi/Service/OrganizedService.cs
@@ -89,7 +89,9 @@ namespace langguanApi.Service
         /// <returns></returns>
         public async Task<ApiResult> List(int OrganizedType = 1)
         {
+            List<OrganizedByDeviceDto> dto = new List<OrganizedByDeviceDto>();
             Expression<Func<Organized, bool>> exp = filter => filter.OrganizedType == OrganizedType && filter.IsDelete == false;
+
             var result = (await base.GetListWithExp(exp)).OrderByDescending(x => x.Order).ToList();
             return new ApiResult() { code = 0, data = result };
         }