diff --git a/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs b/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs
index c5047f7..2026c4a 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs
@@ -36,7 +36,7 @@ namespace ZR.Admin.WebApi.Controllers.System
         /// <returns></returns>
         [ActionPermissionFilter(Permission = "system:menu:list")]
         [HttpGet("list")]
-        public IActionResult TreeMenuList([FromQuery] SysMenu menu)
+        public IActionResult TreeMenuList([FromQuery] MenuQueryDto menu)
         {
             long userId = HttpContext.GetUId();
             return SUCCESS(sysMenuService.SelectTreeMenuList(menu, userId), "yyyy-MM-dd HH:mm:ss");
@@ -62,7 +62,7 @@ namespace ZR.Admin.WebApi.Controllers.System
         public IActionResult TreeSelect()
         {
             long userId = HttpContext.GetUId();
-            var list = sysMenuService.SelectMenuList(new SysMenu(), userId).FindAll(f => f.visible == "0");
+            var list = sysMenuService.SelectMenuList(new MenuQueryDto(), userId).FindAll(f => f.visible == "0");
             var treeMenus = sysMenuService.BuildMenuTreeSelect(list);
 
             return SUCCESS(treeMenus);
@@ -78,7 +78,7 @@ namespace ZR.Admin.WebApi.Controllers.System
         public IActionResult RoleMenuTreeselect(int roleId)
         {
             long userId = HttpContext.GetUId();
-            var menus = sysMenuService.SelectMenuList(new SysMenu(), userId);
+            var menus = sysMenuService.SelectMenuList(new MenuQueryDto(), userId);
             var checkedKeys = sysRoleService.SelectUserRoleMenus(roleId);
             return SUCCESS(new
             {
diff --git a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs
index df0d325..1a87eff 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
+using System;
 using System.Threading.Tasks;
 using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
@@ -98,11 +99,12 @@ namespace ZR.Admin.WebApi.Controllers.System
             SysUser user = UserService.SelectUserById(loginUser.UserId);
             string oldMd5 = NETCore.Encrypt.EncryptProvider.Md5(oldPassword);
             string newMd5 = NETCore.Encrypt.EncryptProvider.Md5(newPassword);
-            if (user.Password != oldMd5.ToLower())
+
+            if (!user.Password.Equals(oldMd5, StringComparison.OrdinalIgnoreCase))
             {
                 return ToResponse(ApiResult.Error("修改密码失败，旧密码错误"));
             }
-            if (user.Password == newMd5.ToLower())
+            if (user.Password.Equals(newMd5, StringComparison.OrdinalIgnoreCase))
             {
                 return ToResponse(ApiResult.Error("新密码不能和旧密码相同"));
             }
diff --git a/ZR.Model/System/Dto/MenuDto.cs b/ZR.Model/System/Dto/MenuDto.cs
index 9b7492d..6791259 100644
--- a/ZR.Model/System/Dto/MenuDto.cs
+++ b/ZR.Model/System/Dto/MenuDto.cs
@@ -73,4 +73,19 @@ namespace ZR.Model.System.Dto
         /// </summary>
         public string MenuNameKey { get; set; }
     }
+
+    public class MenuQueryDto
+    {
+        public string MenuName { get; set; }
+        public string Visible { get; set; }
+        public string Status { get; set; }
+        public string MenuTypeIds { get; set; } = string.Empty;
+        public string[] MenuTypeIdArr
+        {
+            get
+            {
+                return MenuTypeIds.Split(',', StringSplitOptions.RemoveEmptyEntries);
+            }
+        }
+    }
 }
diff --git a/ZR.Repository/System/SysMenuRepository.cs b/ZR.Repository/System/SysMenuRepository.cs
index b66b914..1da6ef4 100644
--- a/ZR.Repository/System/SysMenuRepository.cs
+++ b/ZR.Repository/System/SysMenuRepository.cs
@@ -18,12 +18,13 @@ namespace ZR.Repository.System
         /// 获取所有菜单（菜单管理）
         /// </summary>
         /// <returns></returns>
-        public List<SysMenu> SelectTreeMenuList(SysMenu menu)
+        public List<SysMenu> SelectTreeMenuList(MenuQueryDto menu)
         {
             return Context.Queryable<SysMenu>()
                 .WhereIF(!string.IsNullOrEmpty(menu.MenuName), it => it.MenuName.Contains(menu.MenuName))
-                .WhereIF(!string.IsNullOrEmpty(menu.visible), it => it.visible == menu.visible)
-                .WhereIF(!string.IsNullOrEmpty(menu.status), it => it.status == menu.status)
+                .WhereIF(!string.IsNullOrEmpty(menu.Visible), it => it.visible == menu.Visible)
+                .WhereIF(!string.IsNullOrEmpty(menu.Status), it => it.status == menu.Status)
+
                 .OrderBy(it => new { it.parentId, it.orderNum })
                 .ToTree(it => it.children, it => it.parentId, 0);
         }
@@ -34,7 +35,7 @@ namespace ZR.Repository.System
         /// <param name="sysMenu"></param>
         /// <param name="roles">用户角色集合</param>
         /// <returns></returns>
-        public List<SysMenu> SelectTreeMenuListByUserId(SysMenu sysMenu, List<long> roles)
+        public List<SysMenu> SelectTreeMenuListByUserId(MenuQueryDto sysMenu, List<long> roles)
         {
             var roleMenus = Context.Queryable<SysRoleMenu>()
                 .Where(r => roles.Contains(r.Role_id));
@@ -42,8 +43,8 @@ namespace ZR.Repository.System
             return Context.Queryable<SysMenu>()
                 .InnerJoin(roleMenus, (c, j) => c.MenuId == j.Menu_id)
                 .WhereIF(!string.IsNullOrEmpty(sysMenu.MenuName), (c, j) => c.MenuName.Contains(sysMenu.MenuName))
-                .WhereIF(!string.IsNullOrEmpty(sysMenu.visible), (c, j) => c.visible == sysMenu.visible)
-                .WhereIF(!string.IsNullOrEmpty(sysMenu.status), (c, j) => c.status == sysMenu.status)
+                .WhereIF(!string.IsNullOrEmpty(sysMenu.Visible), (c, j) => c.visible == sysMenu.Visible)
+                .WhereIF(!string.IsNullOrEmpty(sysMenu.Status), (c, j) => c.status == sysMenu.Status)
                 .OrderBy((c, j) => new { c.parentId, c.orderNum })
                 .Select(c => c)
                 .ToTree(it => it.children, it => it.parentId, 0);
@@ -53,12 +54,12 @@ namespace ZR.Repository.System
         /// 获取所有菜单
         /// </summary>
         /// <returns></returns>
-        public List<SysMenu> SelectMenuList(SysMenu menu)
+        public List<SysMenu> SelectMenuList(MenuQueryDto menu)
         {
             return Context.Queryable<SysMenu>()
                 .WhereIF(!string.IsNullOrEmpty(menu.MenuName), it => it.MenuName.Contains(menu.MenuName))
-                .WhereIF(!string.IsNullOrEmpty(menu.visible), it => it.visible == menu.visible)
-                .WhereIF(!string.IsNullOrEmpty(menu.status), it => it.status == menu.status)
+                .WhereIF(!string.IsNullOrEmpty(menu.Visible), it => it.visible == menu.Visible)
+                .WhereIF(!string.IsNullOrEmpty(menu.Status), it => it.status == menu.Status)
                 .OrderBy(it => new { it.parentId, it.orderNum })
                 .ToList();
         }
@@ -69,7 +70,7 @@ namespace ZR.Repository.System
         /// <param name="sysMenu"></param>
         /// <param name="roles">用户角色集合</param>
         /// <returns></returns>
-        public List<SysMenu> SelectMenuListByRoles(SysMenu sysMenu, List<long> roles)
+        public List<SysMenu> SelectMenuListByRoles(MenuQueryDto sysMenu, List<long> roles)
         {
             var roleMenus = Context.Queryable<SysRoleMenu>()
                 .Where(r => roles.Contains(r.Role_id));
@@ -78,7 +79,7 @@ namespace ZR.Repository.System
                 .InnerJoin(roleMenus, (c, j) => c.MenuId == j.Menu_id)
                 .Where((c, j) => c.status == "0")
                 .WhereIF(!string.IsNullOrEmpty(sysMenu.MenuName), (c, j) => c.MenuName.Contains(sysMenu.MenuName))
-                .WhereIF(!string.IsNullOrEmpty(sysMenu.visible), (c, j) => c.visible == sysMenu.visible)
+                .WhereIF(!string.IsNullOrEmpty(sysMenu.Visible), (c, j) => c.visible == sysMenu.Visible)
                 .OrderBy((c, j) => new { c.parentId, c.orderNum })
                 .Select(c => c)
                 .ToList();
@@ -111,7 +112,7 @@ namespace ZR.Repository.System
                 .Where((menu) =>
                 menuTypes.Contains(menu.menuType)
                     && menu.status == "0"
-                    && SqlFunc.Subqueryable<SysRoleMenu>().Where( s => roleIds.Contains(s.Role_id) && s.Menu_id == menu.MenuId).Any())
+                    && SqlFunc.Subqueryable<SysRoleMenu>().Where(s => roleIds.Contains(s.Role_id) && s.Menu_id == menu.MenuId).Any())
                 .OrderBy((menu) => new { menu.parentId, menu.orderNum })
                 .Select((menu) => menu).ToList();
         }
diff --git a/ZR.Service/System/IService/ISysMenuService.cs b/ZR.Service/System/IService/ISysMenuService.cs
index 6c9c416..4577f2c 100644
--- a/ZR.Service/System/IService/ISysMenuService.cs
+++ b/ZR.Service/System/IService/ISysMenuService.cs
@@ -9,8 +9,8 @@ namespace ZR.Service.System.IService
     {
         //List<SysMenu> SelectMenuList(long userId);
 
-        List<SysMenu> SelectMenuList(SysMenu menu, long userId);
-        List<SysMenu> SelectTreeMenuList(SysMenu menu, long userId);
+        List<SysMenu> SelectMenuList(MenuQueryDto menu, long userId);
+        List<SysMenu> SelectTreeMenuList(MenuQueryDto menu, long userId);
 
         SysMenu GetMenuByMenuId(int menuId);
         int AddMenu(SysMenu menu);
diff --git a/ZR.Service/System/SysMenuService.cs b/ZR.Service/System/SysMenuService.cs
index aa85e3e..6e7fd5e 100644
--- a/ZR.Service/System/SysMenuService.cs
+++ b/ZR.Service/System/SysMenuService.cs
@@ -31,7 +31,7 @@ namespace ZR.Service
         /// 获取所有菜单数（菜单管理）
         /// </summary>
         /// <returns></returns>
-        public List<SysMenu> SelectTreeMenuList(SysMenu menu, long userId)
+        public List<SysMenu> SelectTreeMenuList(MenuQueryDto menu, long userId)
         {
             List<SysMenu> menuList;
             if (SysRoleService.IsAdmin(userId))
@@ -50,7 +50,7 @@ namespace ZR.Service
         /// 获取所有菜单列表
         /// </summary>
         /// <returns></returns>
-        public List<SysMenu> SelectMenuList(SysMenu menu, long userId)
+        public List<SysMenu> SelectMenuList(MenuQueryDto menu, long userId)
         {
             List<SysMenu> menuList;
             if (SysRoleService.IsAdmin(userId))