From b6b54164a81e3f0b1359fd9f02efe2c1c14e3405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=A4=A7=E9=A5=BC?= Date: Sat, 12 Oct 2024 17:16:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=80=E5=A0=86=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/System/RoleService.cs | 10 +- Yi.RuoYi.Vue3/src/router/index.js | 6 +- .../src/views/system/role/authUser.vue | 182 +++++++++--------- Yi.RuoYi.Vue3/src/views/system/role/index.vue | 4 +- .../src/views/system/role/selectUser.vue | 117 ++++++----- 5 files changed, 159 insertions(+), 160 deletions(-) diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/RoleService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/RoleService.cs index 7b622a64..7ea3f185 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/RoleService.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/RoleService.cs @@ -97,13 +97,13 @@ namespace Yi.Framework.Rbac.Application.Services.System public override async Task UpdateAsync(Guid id, RoleUpdateInputVo input) { var entity = await _repository.GetByIdAsync(id); - - var isExist =await _repository._DbQueryable.Where(x=>x.Id!=entity.Id).AnyAsync(x=>x.RoleCode==input.RoleCode||x.RoleName==input.RoleName); + + var isExist = await _repository._DbQueryable.Where(x => x.Id != entity.Id).AnyAsync(x => x.RoleCode == input.RoleCode || x.RoleName == input.RoleName); if (isExist) { throw new UserFriendlyException(RoleConst.Exist); } - + await MapToEntityAsync(input, entity); await _repository.UpdateAsync(entity); @@ -195,7 +195,7 @@ namespace Yi.Framework.Rbac.Application.Services.System /// /// /// - public async Task CreateAuthUserAsync(RoleAuthUserCreateOrDeleteInput input) + public async Task CreateAuthUserAsync([FromBody] RoleAuthUserCreateOrDeleteInput input) { var userRoleEntities = input.UserIds.Select(u => new UserRoleEntity { RoleId = input.RoleId, UserId = u }) .ToList(); @@ -208,7 +208,7 @@ namespace Yi.Framework.Rbac.Application.Services.System /// /// /// - public async Task DeleteAuthUserAsync(RoleAuthUserCreateOrDeleteInput input) + public async Task DeleteAuthUserAsync([FromBody] RoleAuthUserCreateOrDeleteInput input) { await _userRoleRepository._Db.Deleteable().Where(x => x.RoleId == input.RoleId) .Where(x => input.UserIds.Contains(x.UserId)) diff --git a/Yi.RuoYi.Vue3/src/router/index.js b/Yi.RuoYi.Vue3/src/router/index.js index 34e110fe..3b04d647 100644 --- a/Yi.RuoYi.Vue3/src/router/index.js +++ b/Yi.RuoYi.Vue3/src/router/index.js @@ -95,7 +95,7 @@ export const dynamicRoutes = [ permissions: ['system:user:edit'], children: [ { - path: 'role/:userId(\\d+)', + path: 'role/:userId([\\w-]+)', component: () => import('@/views/system/user/authRole'), name: 'AuthRole', meta: { title: '分配角色', activeMenu: '/system/user' } @@ -109,7 +109,7 @@ export const dynamicRoutes = [ permissions: ['system:role:edit'], children: [ { - path: 'user/:roleId(\\d+)', + path: 'user/:roleId([\\w-]+)', component: () => import('@/views/system/role/authUser'), name: 'AuthUser', meta: { title: '分配用户', activeMenu: '/system/role' } @@ -151,7 +151,7 @@ export const dynamicRoutes = [ permissions: ['tool:gen:edit'], children: [ { - path: 'index/:tableId(\\d+)', + path: 'index/:tableId([\\w-]+)', component: () => import('@/views/tool/gen/editTable'), name: 'GenEdit', meta: { title: '修改生成配置', activeMenu: '/tool/gen' } diff --git a/Yi.RuoYi.Vue3/src/views/system/role/authUser.vue b/Yi.RuoYi.Vue3/src/views/system/role/authUser.vue index 2868a514..368feb3a 100644 --- a/Yi.RuoYi.Vue3/src/views/system/role/authUser.vue +++ b/Yi.RuoYi.Vue3/src/views/system/role/authUser.vue @@ -1,99 +1,99 @@