From 4a440f3b1c4223380e361da720bba31db0eb1100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Tue, 24 May 2022 18:44:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/System/SysMenuController.cs | 6 ++---
.../System/SysProfileController.cs | 6 +++--
ZR.Model/System/Dto/MenuDto.cs | 15 +++++++++++
ZR.Repository/System/SysMenuRepository.cs | 25 ++++++++++---------
ZR.Service/System/IService/ISysMenuService.cs | 4 +--
ZR.Service/System/SysMenuService.cs | 4 +--
6 files changed, 39 insertions(+), 21 deletions(-)
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
///
[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
///
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
/// 获取所有菜单（菜单管理）
///
///
- public List SelectTreeMenuList(SysMenu menu)
+ public List SelectTreeMenuList(MenuQueryDto menu)
{
return Context.Queryable()
.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
///
/// 用户角色集合
///
- public List SelectTreeMenuListByUserId(SysMenu sysMenu, List roles)
+ public List SelectTreeMenuListByUserId(MenuQueryDto sysMenu, List roles)
{
var roleMenus = Context.Queryable()
.Where(r => roles.Contains(r.Role_id));
@@ -42,8 +43,8 @@ namespace ZR.Repository.System
return Context.Queryable()
.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
/// 获取所有菜单
///
///
- public List SelectMenuList(SysMenu menu)
+ public List SelectMenuList(MenuQueryDto menu)
{
return Context.Queryable()
.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
///
/// 用户角色集合
///
- public List SelectMenuListByRoles(SysMenu sysMenu, List roles)
+ public List SelectMenuListByRoles(MenuQueryDto sysMenu, List roles)
{
var roleMenus = Context.Queryable()
.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().Where( s => roleIds.Contains(s.Role_id) && s.Menu_id == menu.MenuId).Any())
+ && SqlFunc.Subqueryable().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 SelectMenuList(long userId);
- List SelectMenuList(SysMenu menu, long userId);
- List SelectTreeMenuList(SysMenu menu, long userId);
+ List SelectMenuList(MenuQueryDto menu, long userId);
+ List 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
/// 获取所有菜单数（菜单管理）
///
///
- public List SelectTreeMenuList(SysMenu menu, long userId)
+ public List SelectTreeMenuList(MenuQueryDto menu, long userId)
{
List menuList;
if (SysRoleService.IsAdmin(userId))
@@ -50,7 +50,7 @@ namespace ZR.Service
/// 获取所有菜单列表
///
///
- public List SelectMenuList(SysMenu menu, long userId)
+ public List SelectMenuList(MenuQueryDto menu, long userId)
{
List menuList;
if (SysRoleService.IsAdmin(userId))