Skip to content

Commit bef65e1

Browse files
authored
Fix create and delete department validations (#911)
1 parent 87a3cd8 commit bef65e1

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

backend/app/admin/service/dept_service.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ async def create(*, db: AsyncSession, obj: CreateDeptParam) -> None:
6868
dept = await dept_dao.get_by_name(db, obj.name)
6969
if dept:
7070
raise errors.ConflictError(msg='部门名称已存在')
71-
if obj.parent_id:
71+
if obj.parent_id is not None:
7272
parent_dept = await dept_dao.get(db, obj.parent_id)
7373
if not parent_dept:
7474
raise errors.NotFoundError(msg='父级部门不存在')
@@ -108,6 +108,8 @@ async def delete(*, db: AsyncSession, pk: int) -> int:
108108
:return:
109109
"""
110110
dept = await dept_dao.get_with_relation(db, pk)
111+
if not dept:
112+
raise errors.NotFoundError(msg='部门不存在')
111113
if dept.users:
112114
raise errors.ConflictError(msg='部门下存在用户,无法删除')
113115
children = await dept_dao.get_children(db, pk)

0 commit comments

Comments
 (0)