From eb665c7943153b1bfdb3e36b6e0a2973d0dded1a Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 29 Nov 2023 16:23:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20mlog=E5=A2=9E=E5=8A=A0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/mtm/views.py   | 9 +++++++--
 apps/wpm/filters.py | 7 ++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/mtm/views.py b/apps/mtm/views.py
index 2c3e960a..2de4cdf7 100644
--- a/apps/mtm/views.py
+++ b/apps/mtm/views.py
@@ -51,8 +51,13 @@ class MgroupViewSet(CustomModelViewSet):
     queryset = Mgroup.objects.all()
     serializer_class = MgroupSerializer
     select_related_fields = ['create_by', 'belong_dept', 'process']
-    filterset_fields = ['belong_dept', 'process',
-                        'cate', 'belong_dept__name', 'name']
+    filterset_fields = {
+        "belong_dept": ["exact"],
+        "process": ["exact"],
+        "cate": ["exact"],
+        "belong_dept__name": ["exact", "contains"],
+        "name": ["exact", "contains"]
+    }
     search_fields = ['number']
     ordering = ['sort', 'create_time']
 
diff --git a/apps/wpm/filters.py b/apps/wpm/filters.py
index 46952252..808249f9 100644
--- a/apps/wpm/filters.py
+++ b/apps/wpm/filters.py
@@ -50,9 +50,10 @@ class MlogFilter(filters.FilterSet):
             "batch": ["exact"],
             "handle_date": ["exact"],
             "handle_user": ["exact"],
-            "mtask__mgroup__belong_dept__name": ["exact"],
-            "mgroup__belong_dept__name": ["exact", "in"],
-            "mgroup__name": ["exact", "in"],
+            "mgroup": ["exact"],
+            "mtask__mgroup__belong_dept__name": ["exact", "contains", "in"],
+            "mgroup__belong_dept__name": ["exact", "in", "contains"],
+            "mgroup__name": ["exact", "in", "contains"],
             "submit_time": ["isnull"]
         }