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

修复BUG: 当部门没有返回顶级部门时,部门接口为空情况

Browse Source
This commit is contained in:
猿小天
2024-01-01 15:00:17 +08:00
parent 8961733025
commit 369157fa4f
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,13 +115,10 @@ class DeptViewSet(CustomModelViewSet):
del params['page'] del params['page']
if limit: if limit:
del params['limit'] del params['limit']
if params: if params and parent:
if parent: queryset = self.queryset.filter(status=True, parent=parent)
queryset = self.queryset.filter(status=True, parent=parent)
else:
queryset = self.queryset.filter(status=True)
else: else:
queryset = self.queryset.filter(status=True, parent__isnull=True) queryset = self.queryset.filter(status=True)
queryset = self.filter_queryset(queryset) queryset = self.filter_queryset(queryset)
serializer = DeptSerializer(queryset, many=True, request=request) serializer = DeptSerializer(queryset, many=True, request=request)
data = serializer.data data = serializer.data

1
backend/dvadmin/utils/serializers.py
View File

@@ -26,6 +26,7 @@ class CustomModelSerializer(DynamicFieldsMixin, ModelSerializer):
# 修改人的审计字段名称, 默认modifier, 继承使用时可自定义覆盖 # 修改人的审计字段名称, 默认modifier, 继承使用时可自定义覆盖
modifier_field_id = "modifier" modifier_field_id = "modifier"
modifier_name = serializers.SerializerMethodField(read_only=True) modifier_name = serializers.SerializerMethodField(read_only=True)
dept_belong_id = serializers.IntegerField(required=False)
def get_modifier_name(self, instance): def get_modifier_name(self, instance):
if not hasattr(instance, "modifier"): if not hasattr(instance, "modifier"):