From 2c86ad0450f5e52c6fdb35795a348e639b52e762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Wed, 9 Nov 2022 10:13:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96:=20queryset=20=E5=BD=93?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5if=E5=88=A4=E6=96=AD=EF=BC=8Cfor=E5=BE=AA?=
 =?UTF-8?q?=E7=8E=AF=EF=BC=8Cprint=E7=AD=89=EF=BC=8C=E4=BC=9A=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E5=BA=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/system/views/system_config.py | 6 ++----
 backend/dvadmin/system/views/user.py          | 3 ++-
 backend/dvadmin/utils/request_util.py         | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

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