admin/django-vue3-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/dvadmin/dvadmin3/dvadmin3

Browse Source
This commit is contained in:
sheng
2023-08-07 16:22:25 +08:00
parent b9bdf878de db989671c0
commit 3c58bcf467
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/dvadmin/system/views/dept.py
View File

@@ -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

3
backend/dvadmin/system/views/menu.py
View File

@@ -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)