From fa90451a8fe68d18b9fff1b1893c2cf9ec6fea84 Mon Sep 17 00:00:00 2001 From: zhangshaohu Date: Wed, 20 Mar 2024 15:56:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E8=BF=87=E6=BB=A4=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/users/serializers/user_serializers.py | 6 ++++-- apps/users/views/user.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/users/serializers/user_serializers.py b/apps/users/serializers/user_serializers.py index 519735551..2b95cbc8d 100644 --- a/apps/users/serializers/user_serializers.py +++ b/apps/users/serializers/user_serializers.py @@ -502,7 +502,8 @@ class UserInstanceSerializer(ApiMixin, serializers.ModelSerializer): class UserManageSerializer(serializers.Serializer): class Query(ApiMixin, serializers.Serializer): - email_or_username = serializers.CharField(required=False, error_messages=ErrMessage.char("邮箱或者用户名")) + email_or_username = serializers.CharField(required=False, allow_null=True, + error_messages=ErrMessage.char("邮箱或者用户名")) @staticmethod def get_request_params_api(): @@ -528,7 +529,8 @@ class UserManageSerializer(serializers.Serializer): email_or_username = self.data.get('email_or_username') query_set = QuerySet(User) if email_or_username is not None: - query_set = query_set.filter(Q(username=email_or_username) | Q(email=email_or_username)) + query_set = query_set.filter( + Q(username__contains=email_or_username) | Q(email__contains=email_or_username)) return query_set def list(self, with_valid=True): diff --git a/apps/users/views/user.py b/apps/users/views/user.py index aca7e2b85..666bb59a0 100644 --- a/apps/users/views/user.py +++ b/apps/users/views/user.py @@ -226,7 +226,7 @@ class UserManage(APIView): compare=CompareConstants.AND)) def get(self, request: Request, current_page, page_size): d = UserManageSerializer.Query( - data={'name': request.query_params.get('name', None), 'desc': request.query_params.get("desc", None), + data={'email_or_username': request.query_params.get('email_or_username', None), 'user_id': str(request.user.id)}) return result.success(d.page(current_page, page_size))