From f5f0de7716b34697da1905e06851f99e54c2d6d2 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: Mon, 30 May 2022 09:27:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Infrastructure/Extensions/Extension.Validate.cs    | 10 ++++------
 .../Controllers/System/SysMenuController.cs        | 14 --------------
 ZR.Repository/System/SysUserRoleRepository.cs      | 10 ++++------
 ZR.Service/System/SysMenuService.cs                |  3 ---
 4 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/Infrastructure/Extensions/Extension.Validate.cs b/Infrastructure/Extensions/Extension.Validate.cs
index 2d8c083..de3c9c9 100644
--- a/Infrastructure/Extensions/Extension.Validate.cs
+++ b/Infrastructure/Extensions/Extension.Validate.cs
@@ -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")
diff --git a/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs b/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs
index fb1ed13..2dcd91a 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs
@@ -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>
diff --git a/ZR.Repository/System/SysUserRoleRepository.cs b/ZR.Repository/System/SysUserRoleRepository.cs
index 3471436..ec71d72 100644
--- a/ZR.Repository/System/SysUserRoleRepository.cs
+++ b/ZR.Repository/System/SysUserRoleRepository.cs
@@ -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);
         }
     }
diff --git a/ZR.Service/System/SysMenuService.cs b/ZR.Service/System/SysMenuService.cs
index e823ba4..105b710 100644
--- a/ZR.Service/System/SysMenuService.cs
+++ b/ZR.Service/System/SysMenuService.cs
@@ -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>