!63 总算可以管理角色的用户了

Merge pull request !63 from 李大饼/abp
This commit is contained in:
橙子
2024-10-12 17:01:41 +00:00
committed by Gitee
5 changed files with 159 additions and 160 deletions

View File

@@ -195,7 +195,7 @@ namespace Yi.Framework.Rbac.Application.Services.System
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
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
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public async Task DeleteAuthUserAsync(RoleAuthUserCreateOrDeleteInput input)
public async Task DeleteAuthUserAsync([FromBody] RoleAuthUserCreateOrDeleteInput input)
{
await _userRoleRepository._Db.Deleteable<UserRoleEntity>().Where(x => x.RoleId == input.RoleId)
.Where(x => input.UserIds.Contains(x.UserId))

View File

@@ -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' }

View File

@@ -74,10 +74,10 @@
<el-button link icon="CircleCheck" @click="handleDataScope(scope.row)"
v-hasPermi="['system:role:edit']"></el-button>
</el-tooltip>
<!-- <el-tooltip content="分配用户" placement="top" v-if="scope.row.roleId !== 1">
<el-tooltip content="分配用户" placement="top" v-if="scope.row.roleId !== 1">
<el-button link icon="User" @click="handleAuthUser(scope.row)" v-hasPermi="['system:role:edit']">
</el-button>
</el-tooltip> -->
</el-tooltip>
</template>
</el-table-column>
</el-table>

View File

@@ -124,9 +124,8 @@ function handleSelectUser() {
proxy.$modal.msgError("请选择要分配的用户");
return;
}
authUserSelectAll({ roleId: roleId, userIds:uIds }).then(res => {
if (res.statusCode == 200) {
if (res.status == 200 || res.status == 204) {
proxy.$modal.msgSuccess("成功");
visible.value = false;
emit("ok");