From 369157fa4f371ccf8764b3da3965cab73d8c9d22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Mon, 1 Jan 2024 15:00:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG:=20=E5=BD=93=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E6=B2=A1=E6=9C=89=E8=BF=94=E5=9B=9E=E9=A1=B6=E7=BA=A7?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=97=B6,=E9=83=A8=E9=97=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=B8=BA=E7=A9=BA=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/views/dept.py | 9 +++------ backend/dvadmin/utils/serializers.py | 1 + 2 files changed, 4 insertions(+), 6 deletions(-) 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"):