From ef1ea0e7844f7f0e75a8d7767137ff5cb228ea9b Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 29 Jun 2023 11:14:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=9A=E7=9F=A5=E6=8F=90=E9=86=92?= =?UTF-8?q?=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/ecm/service.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/apps/ecm/service.py b/apps/ecm/service.py index 143f9477..fe75ddd0 100644 --- a/apps/ecm/service.py +++ b/apps/ecm/service.py @@ -177,12 +177,16 @@ def create_remind(event: Event, params: dict): }) elif i.post and area_level >= i.filter_area_level: qs = User.objects.filter(posts=i.post) - if i.filter_recipient == 20: # 当事人所在部门以上 - if event.employee and event.employee.user: - qs = qs.filter(depts__in=get_parent_queryset(event.employee.user.belong_dept)) - elif i.filter_recipient == 40: # 属地部门以上 - if event.area.belong_dept: - qs = qs.filter(depts__in=get_parent_queryset(event.area.belong_dept)) + if i.filter_recipient == 20 and event.employee and event.employee.user: + qs = qs.filter(depts__in=get_parent_queryset(event.employee.user.belong_dept)) + elif i.filter_recipient == 10 and event.employee and event.employee.user: + qs = qs.filter(depts=event.employee.user.belong_dept) + elif i.filter_recipient == 40 and event.area.belong_dept: + qs = qs.filter(depts__in=get_parent_queryset(event.area.belong_dept)) + elif i.filter_recipient == 30 and event.area.belong_dept: + qs = qs.filter(depts=event.area.belong_dept) + else: + qs = User.objects.none() for m in qs: Remind.objects.get_or_create(event=event, recipient=m, defaults={