From 4c6b0c36bfb45c7c9d4a2b738212a4b40727391b Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 1 Mar 2022 10:42:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8A=E6=88=90=E5=93=81=E6=A3=80=E7=B4=A2?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=9D=83=E9=99=90=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/system/views.py | 4 ++--
 hb_server/apps/wpm/views.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hb_server/apps/system/views.py b/hb_server/apps/system/views.py
index 3664054..06de18c 100644
--- a/hb_server/apps/system/views.py
+++ b/hb_server/apps/system/views.py
@@ -200,9 +200,9 @@ class PermissionViewSet(ModelViewSet):
     queryset = Permission.objects.all()
     serializer_class = PermissionSerializer
     pagination_class = None
-    search_fields = ['name']
+    search_fields = ['name', 'method']
     ordering_fields = ['sort']
-    ordering = ['pk']
+    ordering = ['sort']
 
 
 class OrganizationViewSet(ModelViewSet):
diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py
index 8d77fed..c27f599 100644
--- a/hb_server/apps/wpm/views.py
+++ b/hb_server/apps/wpm/views.py
@@ -163,7 +163,7 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
                 'to_order').prefetch_related('wp_child')
     serializer_class = WProductListSerializer
     filterset_class = WProductFilterSet
-    search_fields = ['number']
+    search_fields = ['number', 'material__name', 'subproduction_plan__number']
     ordering_fields = ['id']
     ordering = ['id']