gitee
/
django-vue-admin
mirror of https://gitee.com/liqianglog/django-vue-admin
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/dvadmin-dev'

pull/9/head
李强 2021-03-29 02:36:02 +08:00
parent f729114cf9 99729d866e
commit b4f0e07df4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dvadmin-backend/apps/vadmin/permission/serializers.py
View File

@ -95,7 +95,7 @@ class DeptTreeSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = Dept model = Dept
fields = ('id', 'label', 'parentId','status') fields = ('id', 'label', 'parentId', 'status')
# ================================================= # # ================================================= #

2
dvadmin-backend/apps/vadmin/system/views.py
View File

@ -74,7 +74,7 @@ class DictDetailsModelViewSet(CustomModelViewSet):
if not dict_details_dic: if not dict_details_dic:
queryset = self.filter_queryset(self.get_queryset()) queryset = self.filter_queryset(self.get_queryset())
queryset_dic = queryset.order_by('sort').values('dict_data__dictType', 'dictLabel', 'dictValue', queryset_dic = queryset.order_by('sort').values('dict_data__dictType', 'dictLabel', 'dictValue',
'is_default') 'is_default')
for ele in queryset_dic: for ele in queryset_dic:
dictType = ele.pop('dict_data__dictType') dictType = ele.pop('dict_data__dictType')
if dictType in dict_details_dic: if dictType in dict_details_dic: