소스 검색

feat: 租户管理员默认拥有该租户所有菜单权限,所以移除

喵你个旺呀 1 년 전
부모
커밋
7040c052f8

+ 0 - 5
Admin.NET/Admin.NET.Core/Const/CommonConst.cs

@@ -12,11 +12,6 @@ namespace Admin.NET.Core;
 [Const("平台配置")]
 public class CommonConst
 {
-    /// <summary>
-    /// 系统管理员角色编码
-    /// </summary>
-    public const string SysAdminRole = "sys_admin";
-
     /// <summary>
     /// 日志分组名称
     /// </summary>

+ 0 - 4
Admin.NET/Admin.NET.Core/Service/Role/SysRoleService.cs

@@ -134,10 +134,6 @@ public class SysRoleService : IDynamicApiController, ITransient
     [DisplayName("删除角色")]
     public async Task DeleteRole(DeleteRoleInput input)
     {
-        // 禁止删除系统管理员角色
-        var sysRole = await _sysRoleRep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
-        if (sysRole.Code == CommonConst.SysAdminRole) throw Oops.Oh(ErrorCodeEnum.D1019);
-
         // 若角色有用户则禁止删除
         var userIds = await _sysUserRoleService.GetUserIdList(input.Id);
         if (userIds != null && userIds.Count > 0) throw Oops.Oh(ErrorCodeEnum.D1025);

+ 0 - 4
Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs

@@ -283,10 +283,6 @@ public class SysTenantService : IDynamicApiController, ITransient
         };
         await _sysUserRep.InsertAsync(newUser);
 
-        // 关联用户及角色
-        var newUserRole = new SysUserRole { RoleId = newRole.Id, UserId = newUser.Id };
-        await _userRoleRep.InsertAsync(newUserRole);
-
         // 关联租户组织机构和管理员用户
         await _sysTenantRep.UpdateAsync(u => new SysTenant { UserId = newUser.Id, OrgId = newOrg.Id }, u => u.Id == tenantId);