wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
不做码农 2022-05-30 09:27:19 +08:00
parent 2563624936
commit f5f0de7716
4 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Infrastructure/Extensions/Extension.Validate.cs
View File

@ -1,9 +1,4 @@
//using Microsoft.AspNetCore.Http;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Infrastructure.Extensions
{
@ -20,7 +15,10 @@ namespace Infrastructure.Extensions
return true;
}
}
public static bool IsNotEmpty(this object value)
{
return !IsEmpty(value);
}
public static bool IsNullOrZero(this object value)
{
if (value == null || value.ParseToString().Trim() == "0")

14
ZR.Admin.WebApi/Controllers/System/SysMenuController.cs
View File

@ -54,20 +54,6 @@ namespace ZR.Admin.WebApi.Controllers.System
return SUCCESS(sysMenuService.GetMenuByMenuId(menuId), "yyyy-MM-dd HH:mm:ss");
}
///// <summary>
///// 获取菜单下拉树列表(分配角色所需菜单)
///// </summary>
///// <returns></returns>
//[HttpGet("treeSelect")]
//public IActionResult TreeSelect()
//{
// long userId = HttpContext.GetUId();
// var list = sysMenuService.SelectMenuList(new MenuQueryDto(), userId).FindAll(f => f.visible == "0");
// var treeMenus = sysMenuService.BuildMenuTreeSelect(list);
// return SUCCESS(treeMenus);
//}
/// <summary>
/// 根据菜单编号获取菜单列表，菜单管理首次进入
/// </summary>

10
ZR.Repository/System/SysUserRoleRepository.cs
View File

@ -1,4 +1,5 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using SqlSugar;
using System.Collections.Generic;
using ZR.Model;
@ -102,12 +103,9 @@ namespace ZR.Repository.System
{
var query = Context.Queryable<SysUser>()
.Where(it => it.DelFlag == "0")
.Where(it => SqlFunc.Subqueryable<SysUserRole>()
.Where(s => s.UserId == it.UserId && s.RoleId == roleUserQueryDto.RoleId).NotAny());
if (!string.IsNullOrEmpty(roleUserQueryDto.UserName))
{
query = query.Where(x => x.UserName.Contains(roleUserQueryDto.UserName));
}
.Where(it => SqlFunc.Subqueryable<SysUserRole>().Where(s => s.UserId == it.UserId && s.RoleId == roleUserQueryDto.RoleId).NotAny())
.WhereIF(roleUserQueryDto.UserName.IsNotEmpty(), it => it.UserName.Contains(roleUserQueryDto.UserName));
return query.ToPage(roleUserQueryDto);
}
}

3
ZR.Service/System/SysMenuService.cs
View File

@ -171,7 +171,6 @@ namespace ZR.Service
public List<SysMenu> SelectMenuTreeByUserId(long userId)
{
MenuQueryDto dto = new() { Status = "0", MenuTypeIds = "M,C" };
//List<SysMenu> menus;
if (SysRoleService.IsAdmin(userId))
{
return MenuRepository.SelectTreeMenuList(dto);
@ -179,10 +178,8 @@ namespace ZR.Service
else
{
List<long> roleIds = SysRoleService.SelectUserRoles(userId);
//menus = MenuRepository.SelectMenuTreeByRoleIds(roleIds);
return MenuRepository.SelectTreeMenuListByRoles(dto, roleIds);
}
//return GetChildPerms(menus, 0);
}
/// <summary>