|
@ -144,9 +144,9 @@ class RoleService: |
|
|
""" |
|
|
""" |
|
|
add_role = RoleModel(**page_object.model_dump(by_alias=True)) |
|
|
add_role = RoleModel(**page_object.model_dump(by_alias=True)) |
|
|
if not await cls.check_role_name_unique_services(query_db, page_object): |
|
|
if not await cls.check_role_name_unique_services(query_db, page_object): |
|
|
raise ServiceException(message=f'新增角色{page_object.post_name}失败,角色名称已存在') |
|
|
raise ServiceException(message=f'新增角色{page_object.role_name}失败,角色名称已存在') |
|
|
elif not await cls.check_role_key_unique_services(query_db, page_object): |
|
|
elif not await cls.check_role_key_unique_services(query_db, page_object): |
|
|
raise ServiceException(message=f'新增角色{page_object.post_name}失败,角色权限已存在') |
|
|
raise ServiceException(message=f'新增角色{page_object.role_name}失败,角色权限已存在') |
|
|
else: |
|
|
else: |
|
|
try: |
|
|
try: |
|
|
add_result = await RoleDao.add_role_dao(query_db, add_role) |
|
|
add_result = await RoleDao.add_role_dao(query_db, add_role) |
|
@ -178,9 +178,9 @@ class RoleService: |
|
|
if role_info: |
|
|
if role_info: |
|
|
if page_object.type != 'status': |
|
|
if page_object.type != 'status': |
|
|
if not await cls.check_role_name_unique_services(query_db, page_object): |
|
|
if not await cls.check_role_name_unique_services(query_db, page_object): |
|
|
raise ServiceException(message=f'修改角色{page_object.post_name}失败,角色名称已存在') |
|
|
raise ServiceException(message=f'修改角色{page_object.role_name}失败,角色名称已存在') |
|
|
elif not await cls.check_role_key_unique_services(query_db, page_object): |
|
|
elif not await cls.check_role_key_unique_services(query_db, page_object): |
|
|
raise ServiceException(message=f'修改角色{page_object.post_name}失败,角色权限已存在') |
|
|
raise ServiceException(message=f'修改角色{page_object.role_name}失败,角色权限已存在') |
|
|
try: |
|
|
try: |
|
|
await RoleDao.edit_role_dao(query_db, edit_role) |
|
|
await RoleDao.edit_role_dao(query_db, edit_role) |
|
|
if page_object.type != 'status': |
|
|
if page_object.type != 'status': |
|
|