Skip to content

Commit 187dfa5

Browse files
authored
Fix the role update business variables (#640)
1 parent 918c8a9 commit 187dfa5

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

backend/app/admin/service/role_service.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,7 @@ async def update(*, pk: int, obj: UpdateRoleParam) -> int:
126126
if not role:
127127
raise errors.NotFoundError(msg='角色不存在')
128128
if role.name != obj.name:
129-
role = await role_dao.get_by_name(db, obj.name)
130-
if role:
129+
if await role_dao.get_by_name(db, obj.name):
131130
raise errors.ForbiddenError(msg='角色已存在')
132131
count = await role_dao.update(db, pk, obj)
133132
for user in await role.awaitable_attrs.users:
@@ -144,7 +143,7 @@ async def update_role_menu(*, pk: int, menu_ids: UpdateRoleMenuParam) -> int:
144143
:return:
145144
"""
146145
async with async_db_session.begin() as db:
147-
role = await role_dao.get_with_relation(db, pk)
146+
role = await role_dao.get(db, pk)
148147
if not role:
149148
raise errors.NotFoundError(msg='角色不存在')
150149
for menu_id in menu_ids.menus:

0 commit comments

Comments
 (0)