From 31ec00ba55a40b28b00907562324d46a802cbfbd Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 7 Jul 2023 12:59:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8F=90=E5=89=8D=E7=A6=BB=E5=8E=82?= =?UTF-8?q?=E5=8F=AA=E6=A3=80=E6=9F=A5=E6=9C=80=E8=BF=91=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/rpm/views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/rpm/views.py b/apps/rpm/views.py index bff2db07..c016c615 100644 --- a/apps/rpm/views.py +++ b/apps/rpm/views.py @@ -254,8 +254,9 @@ class RpjmemberViewSet(CustomModelViewSet): rpj = obj.rpj if rpj.state not in [Rpj.RPJ_WORKING, Rpj.RPJ_ENTER]: raise ParseError('该项目状态成员不可离厂') - if RpjLog.objects.filter(rpj=rpj, remployee=obj.remployee, operation='member_leave').exists(): - raise ParseError('该项目成员已做离厂操作') + rlog = RpjLog.objects.filter(rpj=rpj, remployee=obj.remployee).order_by('-create_time').first() + if rlog and rlog.operation == 'member_leave': + raise ParseError('该成员已做离厂操作') obj.note = '提前离厂' obj.save() rpj_member_leave(obj)