去掉角色编码必须验证

Admin.NET/Admin.NET.Core/Service/Role/SysRoleService.cs

@@ -53,13 +53,7 @@ public class SysRoleService : IDynamicApiController, ITransient
     [HttpGet("/sysRole/list")]
     public async Task<List<RoleOutput>> GetRoleList()
     {
-        //// 若非超级管理员则只取拥有角色Id集合
-        //var roleIdList = _userManager.SuperAdmin ? new List<long>() :
-        //    await _sysUserRoleService.GetUserRoleIdList(_userManager.UserId);
-
-        return await _sysRoleRep.AsQueryable()
-            //.WhereIF(roleIdList.Count > 0, u => roleIdList.Contains(u.Id))
-            .OrderBy(u => u.Order).Select<RoleOutput>().ToListAsync();
+        return await _sysRoleRep.AsQueryable().OrderBy(u => u.Order).Select<RoleOutput>().ToListAsync();
     }
 
     /// <summary>
@@ -70,7 +64,7 @@ public class SysRoleService : IDynamicApiController, ITransient
     [HttpPost("/sysRole/add")]
     public async Task AddRole(AddRoleInput input)
     {
-        var isExist = await _sysRoleRep.IsAnyAsync(u => u.Code == input.Code || u.Name == input.Name);
+        var isExist = await _sysRoleRep.IsAnyAsync(u => u.Name == input.Name);
         if (isExist)
             throw Oops.Oh(ErrorCodeEnum.D1006);
 
@@ -103,7 +97,7 @@ public class SysRoleService : IDynamicApiController, ITransient
     [HttpPost("/sysRole/update")]
     public async Task UpdateRole(UpdateRoleInput input)
     {
-        var isExist = await _sysRoleRep.IsAnyAsync(u => (u.Name == input.Name || u.Code == input.Code) && u.Id != input.Id);
+        var isExist = await _sysRoleRep.IsAnyAsync(u => u.Name == input.Name && u.Id != input.Id);
         if (isExist)
             throw Oops.Oh(ErrorCodeEnum.D1006);
 
@@ -146,10 +140,6 @@ public class SysRoleService : IDynamicApiController, ITransient
     [HttpPost("/sysRole/grantMenu")]
     public async Task GrantRoleMenu(RoleMenuInput input)
     {
-        var role = await _sysRoleRep.GetFirstAsync(u => u.Id == input.Id);
-        if (!_userManager.SuperAdmin && role.Code == CommonConst.SysAdminRole)
-            throw Oops.Oh(ErrorCodeEnum.D1021);
-
         await _sysRoleMenuService.GrantRoleMenu(input);
     }
 

Web/src/views/system/role/component/editRole.vue

@@ -9,7 +9,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-						<el-form-item label="角色编码" prop="code" :rules="[{ required: true, message: '角色编码不能为空', trigger: 'blur' }]">
+						<el-form-item label="角色编码" prop="code">
 							<el-input v-model="ruleForm.code" placeholder="角色编码" clearable />
 						</el-form-item>
 					</el-col>