优化角色授权菜单逻辑

ZR.Service/System/IService/ISysMenuService.cs

@@ -72,5 +72,13 @@ namespace ZR.Service.System.IService
         /// <param name="roleId"></param>
         /// <returns></returns>
         int DeleteRoleMenuByRoleId(long roleId);
+
+        /// <summary>
+        /// 删除角色指定菜单
+        /// </summary>
+        /// <param name="roleId"></param>
+        /// <param name="menuIds"></param>
+        /// <returns></returns>
+        bool DeleteRoleMenuByRoleIdMenuIds(long roleId, long[] menuIds);
     }
 }

ZR.Service/System/IService/ISysRoleService.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using ZR.Model;
 using ZR.Model.System;
+using ZR.Model.System.Dto;
 
 namespace ZR.Service.System.IService
 {
@@ -81,7 +82,7 @@ namespace ZR.Service.System.IService
         /// </summary>
         /// <param name="role"></param>
         /// <returns></returns>
-        bool AuthDataScope(SysRole role);
+        bool AuthDataScope(SysRoleDto role);
         #region Service
 
 
@@ -90,7 +91,7 @@ namespace ZR.Service.System.IService
         /// </summary>
         /// <param name="sysRoleDto"></param>
         /// <returns></returns>
-        public int InsertRoleMenu(SysRole sysRoleDto);
+        public int InsertRoleMenu(SysRoleDto sysRoleDto);
 
         /// <summary>
         /// 判断是否是管理员

ZR.Service/System/SysRoleMenuService.cs

@@ -26,7 +26,10 @@ namespace ZR.Service.System
         {
             return Delete(roleId);
         }
-
+        public bool DeleteRoleMenuByRoleIdMenuIds(long roleId, long[] menuIds)
+        {
+            return Delete(f => f.Role_id == roleId && menuIds.Contains(f.Menu_id));
+        }
         /// <summary>
         /// 根据角色获取菜单id
         /// </summary>

ZR.Service/System/SysRoleService.cs

@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using ZR.Model;
 using ZR.Model.System;
+using ZR.Model.System.Dto;
 using ZR.Repository;
 using ZR.Service.System.IService;
 
@@ -179,15 +180,31 @@ namespace ZR.Service
         /// </summary>
         /// <param name="sysRoleDto"></param>
         /// <returns></returns>
-        public bool AuthDataScope(SysRole sysRoleDto)
+        public bool AuthDataScope(SysRoleDto sysRoleDto)
         {
             return UseTran2(() =>
             {
                 //删除角色菜单
-                DeleteRoleMenuByRoleId(sysRoleDto.RoleId);
+                //DeleteRoleMenuByRoleId(sysRoleDto.RoleId);
+                //InsertRoleMenu(sysRoleDto);
+                var oldMenus = SelectUserRoleMenus(sysRoleDto.RoleId);
+                var newMenus = sysRoleDto.MenuIds;
+
+                //并集菜单
+                var arr_c = oldMenus.Intersect(newMenus).ToArray();
+                //获取减量菜单
+                var delMenuIds = oldMenus.Where(c => !arr_c.Contains(c)).ToArray();
+                //获取增量
+                var addMenuIds = newMenus.Where(c => !arr_c.Contains(c)).ToArray();
+
+                RoleMenuService.DeleteRoleMenuByRoleIdMenuIds(sysRoleDto.RoleId, delMenuIds);
+                sysRoleDto.MenuIds = addMenuIds.ToList();
+                sysRoleDto.DelMenuIds= delMenuIds.ToList();
                 InsertRoleMenu(sysRoleDto);
+                Console.WriteLine($"减少了{delMenuIds.Length},增加了{addMenuIds.Length}菜单");
             });
         }
+
         #region Service
 
 
@@ -196,14 +213,14 @@ namespace ZR.Service
         /// </summary>
         /// <param name="sysRoleDto"></param>
         /// <returns></returns>
-        public int InsertRoleMenu(SysRole sysRoleDto)
+        public int InsertRoleMenu(SysRoleDto sysRoleDto)
         {
             int rows = 1;
             // 新增用户与角色管理
-            List<SysRoleMenu> sysRoleMenus = new List<SysRoleMenu>();
+            List<SysRoleMenu> sysRoleMenus = new();
             foreach (var item in sysRoleDto.MenuIds)
             {
-                SysRoleMenu rm = new SysRoleMenu
+                SysRoleMenu rm = new()
                 {
                     Menu_id = item,
                     Role_id = sysRoleDto.RoleId,

ZR.Service/System/SysUserRoleService.cs

@@ -16,13 +16,6 @@ namespace ZR.Service.System
     [AppService(ServiceType = typeof(ISysUserRoleService), ServiceLifetime = LifeTime.Transient)]
     public class SysUserRoleService : BaseService<SysUserRole>, ISysUserRoleService
     {
-        //public SysUserRoleRepository SysUserRoleRepository;
-
-        //public SysUserRoleService(SysUserRoleRepository sysUserRoleRepository)
-        //{
-        //    SysUserRoleRepository = sysUserRoleRepository;
-        //}
-
         /// <summary>
         /// 通过角色ID查询角色使用数量
         /// </summary>
@@ -85,7 +78,6 @@ namespace ZR.Service.System
         /// <returns></returns>
         public PagedInfo<SysUser> GetSysUsersByRoleId(RoleUserQueryDto roleUserQueryDto)
         {
-            //return SysUserRoleRepository.GetSysUsersByRoleId(roleUserQueryDto);
             var query = Context.Queryable<SysUserRole, SysUser>((t1, u) => new JoinQueryInfos(
                 JoinType.Left, t1.UserId == u.UserId))
                 .Where((t1, u) => t1.RoleId == roleUserQueryDto.RoleId && u.DelFlag == "0");