diff --git a/kinit-admin/src/views/vadmin/auth/menu/index.vue b/kinit-admin/src/views/vadmin/auth/menu/index.vue index 8af0ac5..8921fe9 100644 --- a/kinit-admin/src/views/vadmin/auth/menu/index.vue +++ b/kinit-admin/src/views/vadmin/auth/menu/index.vue @@ -7,7 +7,6 @@ import { addMenuListApi, putMenuListApi } from '@/api/vadmin/auth/menu' -import { TableData } from '@/api/table/types' import { useTable } from '@/hooks/web/useTable' import { useI18n } from '@/hooks/web/useI18n' import { ElButton, ElSwitch } from 'element-plus' @@ -30,7 +29,7 @@ const getOptions = async () => { getOptions() -const { register, tableObject, methods } = useTable({ +const { register, tableObject, methods } = useTable({ getListApi: getMenuListApi, delListApi: delMenuListApi, response: { diff --git a/kinit-admin/src/views/vadmin/auth/role/index.vue b/kinit-admin/src/views/vadmin/auth/role/index.vue index 9d1cc7e..35a0de3 100644 --- a/kinit-admin/src/views/vadmin/auth/role/index.vue +++ b/kinit-admin/src/views/vadmin/auth/role/index.vue @@ -116,10 +116,10 @@ getList() @register="register" > diff --git a/kinit-admin/src/views/vadmin/auth/user/index.vue b/kinit-admin/src/views/vadmin/auth/user/index.vue index ceee340..2fedac8 100644 --- a/kinit-admin/src/views/vadmin/auth/user/index.vue +++ b/kinit-admin/src/views/vadmin/auth/user/index.vue @@ -141,7 +141,13 @@ getList() {{ t('exampleDemo.edit') }} - + {{ t('exampleDemo.del') }} diff --git a/kinit-api/apps/vadmin/auth/views.py b/kinit-api/apps/vadmin/auth/views.py index afcba6c..16d480b 100644 --- a/kinit-api/apps/vadmin/auth/views.py +++ b/kinit-api/apps/vadmin/auth/views.py @@ -33,6 +33,10 @@ async def create_user(data: schemas.UserIn, auth: Auth = Depends(login_auth)): @app.delete("/users/", summary="批量删除用户") async def delete_users(ids: list = Depends(id_list), auth: Auth = Depends(login_auth)): + if auth.user.id in ids: + return ErrorResponse("不能删除当前登录用户") + elif 1 in ids: + return ErrorResponse("不能删除超级管理员用户") await crud.UserDal(auth.db).delete_datas(ids=ids) return SuccessResponse("删除成功") @@ -83,12 +87,16 @@ async def create_role(role: schemas.RoleIn, auth: Auth = Depends(login_auth)): @app.delete("/roles/", summary="批量删除角色") async def delete_roles(ids: list = Depends(id_list), auth: Auth = Depends(login_auth)): + if 1 in ids: + return ErrorResponse("不能删除管理员角色") await crud.RoleDal(auth.db).delete_datas(ids) return SuccessResponse("删除成功") @app.put("/roles/{data_id}/", summary="更新角色信息") async def put_role(data_id: int, data: schemas.RoleIn, auth: Auth = Depends(login_auth)): + if 1 == data_id: + return ErrorResponse("不能修改管理员角色") return SuccessResponse(await crud.RoleDal(auth.db).put_data(data_id, data))