菜单提交
This commit is contained in:
		
							parent
							
								
									9b7ea8a0ec
								
							
						
					
					
						commit
						612f0b0f76
					
				| 
						 | 
					@ -177,11 +177,10 @@
 | 
				
			||||||
            菜单服务
 | 
					            菜单服务
 | 
				
			||||||
            </summary>
 | 
					            </summary>
 | 
				
			||||||
        </member>
 | 
					        </member>
 | 
				
			||||||
        <member name="M:langguanApi.Controllers.MenuController.List(langguanApi.Model.reqpage)">
 | 
					        <member name="M:langguanApi.Controllers.MenuController.List">
 | 
				
			||||||
            <summary>
 | 
					            <summary>
 | 
				
			||||||
            获取菜单列表
 | 
					            获取菜单列表
 | 
				
			||||||
            </summary>
 | 
					            </summary>
 | 
				
			||||||
            <param name="input"></param>
 | 
					 | 
				
			||||||
            <returns></returns>
 | 
					            <returns></returns>
 | 
				
			||||||
        </member>
 | 
					        </member>
 | 
				
			||||||
        <member name="M:langguanApi.Controllers.MenuController.Add(langguanApi.Model.Entity.AddMenuDto)">
 | 
					        <member name="M:langguanApi.Controllers.MenuController.Add(langguanApi.Model.Entity.AddMenuDto)">
 | 
				
			||||||
| 
						 | 
					@ -1793,11 +1792,17 @@
 | 
				
			||||||
            <param name="input"></param>
 | 
					            <param name="input"></param>
 | 
				
			||||||
            <returns></returns>
 | 
					            <returns></returns>
 | 
				
			||||||
        </member>
 | 
					        </member>
 | 
				
			||||||
        <member name="M:langguanApi.Service.MenuService.Pager(langguanApi.Model.reqpage)">
 | 
					        <member name="M:langguanApi.Service.MenuService.GetMenuTree">
 | 
				
			||||||
            <summary>
 | 
					            <summary>
 | 
				
			||||||
            获取菜单树
 | 
					            获取菜单树
 | 
				
			||||||
            </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>
 | 
					            <returns></returns>
 | 
				
			||||||
        </member>
 | 
					        </member>
 | 
				
			||||||
        <member name="T:langguanApi.Service.OrganizedService">
 | 
					        <member name="T:langguanApi.Service.OrganizedService">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -24,12 +24,11 @@ namespace langguanApi.Controllers
 | 
				
			||||||
        /// <summary>
 | 
					        /// <summary>
 | 
				
			||||||
        /// 获取菜单列表
 | 
					        /// 获取菜单列表
 | 
				
			||||||
        /// </summary>
 | 
					        /// </summary>
 | 
				
			||||||
        /// <param name="input"></param>
 | 
					 | 
				
			||||||
        /// <returns></returns>
 | 
					        /// <returns></returns>
 | 
				
			||||||
        [HttpGet("list")]
 | 
					        [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);
 | 
					            return Ok(result);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        /// <summary>
 | 
					        /// <summary>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -34,15 +34,14 @@ namespace langguanApi.Service
 | 
				
			||||||
        /// <summary>
 | 
					        /// <summary>
 | 
				
			||||||
        /// 获取菜单树
 | 
					        /// 获取菜单树
 | 
				
			||||||
        /// </summary>
 | 
					        /// </summary>
 | 
				
			||||||
        /// <param name="input"></param>
 | 
					 | 
				
			||||||
        /// <returns></returns>
 | 
					        /// <returns></returns>
 | 
				
			||||||
        public async Task<ApiResult> Pager(reqpage input)
 | 
					        public async Task<ApiResult> GetMenuTree()
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            Expression<Func<Menu, bool>> exp = filter => filter.IsDelete == false;
 | 
					            //Expression<Func<Menu, bool>> exp = filter => filter.IsDelete == false;
 | 
				
			||||||
            if (!string.IsNullOrEmpty(input.key))
 | 
					            //if (!string.IsNullOrEmpty(input.key))
 | 
				
			||||||
            {
 | 
					            //{
 | 
				
			||||||
                exp = exp.And(filter => filter.Name.Contains(input.key));
 | 
					            //    exp = exp.And(filter => filter.Name.Contains(input.key));
 | 
				
			||||||
            }
 | 
					            //}
 | 
				
			||||||
            List<MenuTreeDto> dto = new List<MenuTreeDto>();
 | 
					            List<MenuTreeDto> dto = new List<MenuTreeDto>();
 | 
				
			||||||
            var MenuList = await GetChildList(null);
 | 
					            var MenuList = await GetChildList(null);
 | 
				
			||||||
            foreach (var item in MenuList)
 | 
					            foreach (var item in MenuList)
 | 
				
			||||||
| 
						 | 
					@ -58,12 +57,6 @@ namespace langguanApi.Service
 | 
				
			||||||
                });
 | 
					                });
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            return new ApiResult() { data = dto };
 | 
					            return new ApiResult() { data = dto };
 | 
				
			||||||
 | 
					 | 
				
			||||||
            //return await base.GetPager(new ReqPaing()
 | 
					 | 
				
			||||||
            //{
 | 
					 | 
				
			||||||
            //    pageSize = input.pageSize,
 | 
					 | 
				
			||||||
            //    current = input.current
 | 
					 | 
				
			||||||
            //}, exp);
 | 
					 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        /// <summary>
 | 
					        /// <summary>
 | 
				
			||||||
        /// 递归获取子菜单列表
 | 
					        /// 递归获取子菜单列表
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -89,7 +89,9 @@ namespace langguanApi.Service
 | 
				
			||||||
        /// <returns></returns>
 | 
					        /// <returns></returns>
 | 
				
			||||||
        public async Task<ApiResult> List(int OrganizedType = 1)
 | 
					        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;
 | 
					            Expression<Func<Organized, bool>> exp = filter => filter.OrganizedType == OrganizedType && filter.IsDelete == false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            var result = (await base.GetListWithExp(exp)).OrderByDescending(x => x.Order).ToList();
 | 
					            var result = (await base.GetListWithExp(exp)).OrderByDescending(x => x.Order).ToList();
 | 
				
			||||||
            return new ApiResult() { code = 0, data = result };
 | 
					            return new ApiResult() { code = 0, data = result };
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue