From 92583ef37f06175230759fa459db65f4391d5d67 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 20 Dec 2021 22:47:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E6=95=B4=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/views.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/safesite/views.py b/safesite/views.py
index fe85d6e5..cdba4f82 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -5605,12 +5605,12 @@ def apioperation(req):
         obj.zynr = data['zynr']
         obj.kssj = data['kssj']
         obj.jssj = data['jssj']
-        if 'zyqy' in data:
+        if data.get('zyqy', None):
             obj.zyqy = Area.objects.get(
-                id=data['zyqy']) if data['zyqy'] else None
+                id=data['zyqy'])
         obj.zylx = Dickey.objects.get(dickeyid=data['zylx'])
         obj.zybm = oneuser.ubelongpart
-        if 'zybm' in data:
+        if data.get('zybm', None):
             obj.zybm = Partment.objects.get(partid=data['zybm'])
         obj.sdbm = Partment.objects.get(partid=data['sdbm'])
         obj.zyfzr = oneuser
@@ -5621,6 +5621,7 @@ def apioperation(req):
             if data['splc']==0:#无审批
                 obj.zyzt = {'zyzt':'待关闭','index':0,'splc':0}
                 obj.save()
+                Operzyry.objects.filter(oper=obj).delete()
                 for i in data['zyry']:
                     Operzyry.objects.create(oper=obj, operzyry=User.objects.get(userid=i), checked=1)
                 return JsonResponse({"code": 1})
@@ -5646,6 +5647,7 @@ def apioperation(req):
         obj.save()
         # Operspxq.objects.create(oper=obj,jdmc='作业负责人审批',spr=obj.zyfzr,checked=1,spbm=obj.zyfzr.ubelongpart)
         b = []  # 发送通知
+        Operzyry.objects.filter(oper=obj).delete()
         for i in data['zyry']:
             x = User.objects.get(userid=i)
             if int(userid) == int(i):  # 申请人包含作业人直接确认
@@ -5790,7 +5792,7 @@ def apioperation(req):
         zyid = req.GET.get('zyid')
         a = Operation.objects.filter(zyid=zyid)
         x = a.values('zyid', 'zydd', 'zylx__dickeyname', 'zynum', 'zyfzr__name', 'zynr', 'zyzt', 'zyimg', 'zylx', 'sdbm',
-                     'submittime', 'zybm__partname', 'sdbm__partname', 'kssj', 'jssj', 'fxcs', 'zyimg2','zyqy__name')[0]
+                     'submittime', 'zybm__partname', 'sdbm__partname', 'kssj', 'jssj', 'fxcs', 'zyimg2','zyqy__name', 'zyqy')[0]
         if x['zyimg'] != '':
                 x['zyimg'] = x['zyimg'].split('?')
         else: