From 1582353279e348b9872a5f697adcf746ef1208ea Mon Sep 17 00:00:00 2001 From: ahhui Date: Mon, 7 Aug 2023 14:50:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=92=8C=E8=8F=9C=E5=8D=95=E6=96=B0=E5=A2=9E=E7=88=B6=E7=BA=A7?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E7=AC=AC=E4=B8=80=E4=B8=AA=E5=AD=90=E7=BA=A7?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=97=B6sort=E6=89=BE=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/views/dept.py | 3 ++- backend/dvadmin/system/views/menu.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/dvadmin/system/views/dept.py b/backend/dvadmin/system/views/dept.py index c4681fe..8d06c30 100644 --- a/backend/dvadmin/system/views/dept.py +++ b/backend/dvadmin/system/views/dept.py @@ -69,7 +69,8 @@ class DeptCreateUpdateSerializer(CustomModelSerializer): value = validated_data.get('parent', None) if value is None: validated_data['parent'] = self.request.user.dept - last_sort = Dept.objects.filter(parent=self.request.user.dept).order_by('-sort').first().sort + dept_obj = Dept.objects.filter(parent=self.request.user.dept).order_by('-sort').first() + last_sort = dept_obj.sort if dept_obj else 0 validated_data['sort'] = last_sort + 1 instance = super().create(validated_data) instance.dept_belong_id = instance.id diff --git a/backend/dvadmin/system/views/menu.py b/backend/dvadmin/system/views/menu.py index 633fa72..6899646 100644 --- a/backend/dvadmin/system/views/menu.py +++ b/backend/dvadmin/system/views/menu.py @@ -50,7 +50,8 @@ class MenuCreateSerializer(CustomModelSerializer): name = serializers.CharField(required=False) def create(self, validated_data): - last_sort = Menu.objects.filter(parent_id=validated_data.get('parent', None)).order_by('-sort').first().sort + menu_obj = Menu.objects.filter(parent_id=validated_data.get('parent', None)).order_by('-sort').first() + last_sort = menu_obj.sort if menu_obj else 0 validated_data['sort'] = last_sort + 1 return super().create(validated_data)