diff --git a/User/views.py b/User/views.py index c7e716e..32525dd 100644 --- a/User/views.py +++ b/User/views.py @@ -349,12 +349,17 @@ class DeleteDepartment(APIView): id = request.data.get('id') if not all([id]): return Response({'status': 'error', 'message': '缺少参数', 'code': 1}, status=status.HTTP_400_BAD_REQUEST) - dep = Department.objects.get(id=id) - department = User.objects.filter(department=dep.username) - if department: - return Response({'status': 'error', 'message': '删除失败,该部门还存在,请及时转移', 'code': 1}, status=status.HTTP_400_BAD_REQUEST) + + try: + dep = Department.objects.get(id=id) + except Department.DoesNotExist: + return Response({'status': 'error', 'message': '部门不存在', 'code': 1}, status=status.HTTP_404_NOT_FOUND) + + department = User.objects.filter(department=dep) + if department.exists(): + return Response({'status': 'error', 'message': '删除失败,该部门还存在人员,请及时转移', 'code': 1}, status=status.HTTP_400_BAD_REQUEST) - Department.objects.filter(id=id).delete() + dep.delete() return Response({'message': '删除成功', 'code': 0}, status=status.HTTP_200_OK) class Personlist(APIView):