数据权限

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml

@@ -351,6 +351,12 @@
             <param name="isDel"></param>
             <returns></returns>
         </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.RoleController.UpdateDataScpoce(Yi.Framework.DTOModel.RoleInfoDto)">
+             <summary>
+            更改角色数据权限
+             </summary>
+             <returns></returns>
+        </member>
         <member name="T:Yi.Framework.ApiMicroservice.Controllers.TestController">
             <summary>
             测试控制器

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs

@@ -85,9 +85,16 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         public async Task<Result> UpdateStatus(long roleId, bool isDel)
         {
             return Result.Success().SetData(await _iRoleService._repository.UpdateIgnoreNullAsync(new RoleEntity() { Id = roleId, IsDeleted = isDel }));
-
         }
 
-      
+        /// <summary>
+        ///更改角色数据权限
+        /// </summary>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<Result> UpdateDataScpoce(RoleInfoDto roleDto)
+        {
+            return Result.Success().SetStatus(await _iRoleService.UpdateDataScpoce(roleDto));
+        }
     }
 }

Yi.Framework.Net6/Yi.Framework.Interface/IRoleService.cs

@@ -52,5 +52,20 @@ namespace Yi.Framework.Interface
         /// <param name="roleDto"></param>
         /// <returns></returns>
         Task<bool> UpdateInfo(RoleInfoDto roleDto);
+
+        /// <summary>
+        /// 给角色设置部门
+        /// </summary>
+        /// <param name="roleIds"></param>
+        /// <param name="deptIds"></param>
+        /// <returns></returns>
+        Task<bool> GiveRoleSetDept(List<long> roleIds, List<long> deptIds);
+
+        /// <summary>
+        /// 更新角色数据权限
+        /// </summary>
+        /// <param name="roleDto"></param>
+        /// <returns></returns>
+        Task<bool> UpdateDataScpoce(RoleInfoDto roleDto);
     }
 }

Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs

@@ -28,8 +28,6 @@ namespace Yi.Framework.Service
                 //遍历用户
                 foreach (var roleId in roleIds)
                 {
-                 
-
                     //添加新的关系
                     List<RoleMenuEntity> roleMenuEntity = new();
                     foreach (var menu in menuIds)
@@ -76,12 +74,46 @@ namespace Yi.Framework.Service
             return !0.Equals(res1) && res2;
         }
 
+        public async Task<bool> GiveRoleSetDept(List<long> roleIds,List<long> deptIds)
+        {
+            var _repositoryRoleDept = _repository.ChangeRepository<Repository<RoleDeptEntity>>();
+            //多次操作，需要事务确保原子性
+            return await _repositoryRoleDept.UseTranAsync(async () =>
+            {   //删除用户之前所有的用户角色关系（物理删除，没有恢复的必要）
+                await _repositoryRoleDept.DeleteAsync(u => roleIds.Contains((long)u.RoleId));
+
+                //遍历角色
+                foreach (var roleId in roleIds)
+                {
+                    //添加新的关系
+                    List<RoleDeptEntity> roleDeptEntity = new();
+                    foreach (var dept in deptIds)
+                    {
+                        roleDeptEntity.Add(new RoleDeptEntity() { RoleId = roleId, DeptId = dept });
+                    }
+
+                    //一次性批量添加
+                    await _repositoryRoleDept.InsertReturnSnowflakeIdAsync(roleDeptEntity);
+                }
+            });
+        }
 
         public async Task<bool> UpdateInfo(RoleInfoDto roleDto)
         {
             var res1 = await _repository.UpdateIgnoreNullAsync(roleDto.Role);
             var res2 = await GiveRoleSetMenu(new List<long> { roleDto.Role.Id }, roleDto.MenuIds);
-            return res1 && res2;
+            var res3 = await GiveRoleSetDept(new List<long> { roleDto.Role.Id }, roleDto.DeptIds);
+            return res1 && res2&& res3;
+        }
+
+        public async Task<bool> UpdateDataScpoce(RoleInfoDto roleDto)
+        {
+           var role= new RoleEntity();
+            role.Id = roleDto.Role.Id;
+            role.DataScope = roleDto.Role.DataScope;
+            var res1 = await _repository.UpdateIgnoreNullAsync(role);
+            var res3 = await GiveRoleSetDept(new List<long> { roleDto.Role.Id }, roleDto.DeptIds);
+            return res1 && res3;
         }
     }
 }