diff --git a/backend/dvadmin/system/views/system_config.py b/backend/dvadmin/system/views/system_config.py index aa97091..cd664d3 100644 --- a/backend/dvadmin/system/views/system_config.py +++ b/backend/dvadmin/system/views/system_config.py @@ -108,10 +108,8 @@ class SystemConfigChinldernSerializer(CustomModelSerializer): def get_chinldern(self, instance): queryset = SystemConfig.objects.filter(parent=instance) - if queryset: - serializer = SystemConfigSerializer(queryset, many=True) - return serializer.data - return None + serializer = SystemConfigSerializer(queryset, many=True) + return serializer.data class Meta: model = SystemConfig diff --git a/backend/dvadmin/system/views/user.py b/backend/dvadmin/system/views/user.py index b036370..f5f7d0c 100644 --- a/backend/dvadmin/system/views/user.py +++ b/backend/dvadmin/system/views/user.py @@ -231,7 +231,8 @@ class UserViewSet(CustomModelViewSet): update_serializer_class = UserUpdateSerializer # filter_fields = ["name", "username", "gender", "is_active", "dept", "user_type"] filter_fields = { - "name": ["icontains"], + "name": ["exact"], + "mobile": ["exact"], "username": ["exact"], "gender": ["icontains"], "is_active": ["icontains"], diff --git a/backend/dvadmin/utils/request_util.py b/backend/dvadmin/utils/request_util.py index a964993..a87ac27 100644 --- a/backend/dvadmin/utils/request_util.py +++ b/backend/dvadmin/utils/request_util.py @@ -154,7 +154,7 @@ def get_verbose_name(queryset=None, view=None, model=None): :return: """ try: - if queryset and hasattr(queryset, 'model'): + if queryset is not None and hasattr(queryset, 'model'): model = queryset.model elif view and hasattr(view.get_queryset(), 'model'): model = view.get_queryset().model