fm453/kinit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增对当前用户以及管理员用户的保护，不允许删除

Browse Source
This commit is contained in:
ktianc 2022-10-13 10:02:00 +08:00
parent 8164fbc716
commit 284a247f5e
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kinit-admin/src/views/vadmin/auth/menu/index.vue
View File

@ -7,7 +7,6 @@ import {
addMenuListApi, addMenuListApi,
putMenuListApi putMenuListApi
} from '@/api/vadmin/auth/menu' } from '@/api/vadmin/auth/menu'
import { TableData } from '@/api/table/types'
import { useTable } from '@/hooks/web/useTable' import { useTable } from '@/hooks/web/useTable'
import { useI18n } from '@/hooks/web/useI18n' import { useI18n } from '@/hooks/web/useI18n'
import { ElButton, ElSwitch } from 'element-plus' import { ElButton, ElSwitch } from 'element-plus'
@ -30,7 +29,7 @@ const getOptions = async () => {
getOptions() getOptions()
const { register, tableObject, methods } = useTable<TableData>({ const { register, tableObject, methods } = useTable({
getListApi: getMenuListApi, getListApi: getMenuListApi,
delListApi: delMenuListApi, delListApi: delMenuListApi,
response: { response: {

4
kinit-admin/src/views/vadmin/auth/role/index.vue
View File

@ -116,10 +116,10 @@ getList()
@register="register" @register="register"
> >
<template #action="{ row }"> <template #action="{ row }">
<ElButton type="primary" text size="small" @click="updateAction(row)"> <ElButton type="primary" text size="small" @click="updateAction(row)" v-if="row.id !== 1">
{{ t('exampleDemo.edit') }} {{ t('exampleDemo.edit') }}
</ElButton> </ElButton>
<ElButton type="danger" text size="small" @click="delData(row)"> <ElButton type="danger" text size="small" @click="delData(row)" v-if="row.id !== 1">
{{ t('exampleDemo.del') }} {{ t('exampleDemo.del') }}
</ElButton> </ElButton>
</template> </template>

8
kinit-admin/src/views/vadmin/auth/user/index.vue
View File

@ -141,7 +141,13 @@ getList()
<ElButton type="primary" text size="small" @click="updateAction(row)"> <ElButton type="primary" text size="small" @click="updateAction(row)">
{{ t('exampleDemo.edit') }} {{ t('exampleDemo.edit') }}
</ElButton> </ElButton>
<ElButton type="danger" text size="small" @click="delData(row)"> <ElButton
type="danger"
text
size="small"
@click="delData(row)"
v-if="authStore.getUser.id !== row.id && row.id !== 1"
>
{{ t('exampleDemo.del') }} {{ t('exampleDemo.del') }}
</ElButton> </ElButton>
</template> </template>

8
kinit-api/apps/vadmin/auth/views.py
View File

@ -33,6 +33,10 @@ async def create_user(data: schemas.UserIn, auth: Auth = Depends(login_auth)):
@app.delete("/users/", summary="批量删除用户") @app.delete("/users/", summary="批量删除用户")
async def delete_users(ids: list = Depends(id_list), auth: Auth = Depends(login_auth)): 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) await crud.UserDal(auth.db).delete_datas(ids=ids)
return SuccessResponse("删除成功") return SuccessResponse("删除成功")
@ -83,12 +87,16 @@ async def create_role(role: schemas.RoleIn, auth: Auth = Depends(login_auth)):
@app.delete("/roles/", summary="批量删除角色") @app.delete("/roles/", summary="批量删除角色")
async def delete_roles(ids: list = Depends(id_list), auth: Auth = Depends(login_auth)): 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) await crud.RoleDal(auth.db).delete_datas(ids)
return SuccessResponse("删除成功") return SuccessResponse("删除成功")
@app.put("/roles/{data_id}/", summary="更新角色信息") @app.put("/roles/{data_id}/", summary="更新角色信息")
async def put_role(data_id: int, data: schemas.RoleIn, auth: Auth = Depends(login_auth)): 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)) return SuccessResponse(await crud.RoleDal(auth.db).put_data(data_id, data))