diff --git a/backend/dvadmin/system/views/dept.py b/backend/dvadmin/system/views/dept.py index e934c39..5c5105b 100644 --- a/backend/dvadmin/system/views/dept.py +++ b/backend/dvadmin/system/views/dept.py @@ -115,13 +115,10 @@ class DeptViewSet(CustomModelViewSet): del params['page'] if limit: del params['limit'] - if params: - if parent: - queryset = self.queryset.filter(status=True, parent=parent) - else: - queryset = self.queryset.filter(status=True) + if params and parent: + queryset = self.queryset.filter(status=True, parent=parent) else: - queryset = self.queryset.filter(status=True, parent__isnull=True) + queryset = self.queryset.filter(status=True) queryset = self.filter_queryset(queryset) serializer = DeptSerializer(queryset, many=True, request=request) data = serializer.data diff --git a/backend/dvadmin/utils/serializers.py b/backend/dvadmin/utils/serializers.py index c2b047d..6aef88d 100644 --- a/backend/dvadmin/utils/serializers.py +++ b/backend/dvadmin/utils/serializers.py @@ -26,6 +26,7 @@ class CustomModelSerializer(DynamicFieldsMixin, ModelSerializer): # 修改人的审计字段名称, 默认modifier, 继承使用时可自定义覆盖 modifier_field_id = "modifier" modifier_name = serializers.SerializerMethodField(read_only=True) + dept_belong_id = serializers.IntegerField(required=False) def get_modifier_name(self, instance): if not hasattr(instance, "modifier"):