From f7c7dd7f11a9b7dc5d3e13762e5449cb13a1d45c Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 11 Apr 2022 07:48:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=B7=E4=BD=BF=E7=94=A8=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E6=89=AB=E7=A0=81=E6=89=93=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/urls.py | 2 ++ safesite/views.py | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/safesite/urls.py b/safesite/urls.py index d6535459..748c5023 100644 --- a/safesite/urls.py +++ b/safesite/urls.py @@ -264,4 +264,6 @@ urlpatterns = [ path('companyinfo/', views.companyinfo), path('rlt/',include('safesite.rlt.urls')), path('mgt/',include('safesite.mgt.urls')), + + path('miniprogram/', views.miniprogram), ] diff --git a/safesite/views.py b/safesite/views.py index 16cb1e9c..d0df3241 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -164,6 +164,9 @@ def upfile(req): # html页面 +def miniprogram(req): + return HttpResponse('请您使用微信扫码打开') + def safelist(req): return render(req, 'safelist.html') @@ -737,8 +740,8 @@ def index(req): def logout(req): if req.session.get('userid', None): - logger.info('method: %s user: %s 登出' % - (req.method, req.session['userid'])) + # logger.info('method: %s user: %s 登出' % + # (req.method, req.session['userid'])) req.session.flush() return redirect('login') @@ -2782,7 +2785,7 @@ def fxhandle(req): def takeSecond(elem): return elem['number'] - +@apicheck_login def userhandle(req): if req.GET.get('a') == 'adduserh': return render(req, 'abuser.html') From b25101bf924143df822d864de3b4ea2299f4d70b Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 13 Apr 2022 00:33:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/datashowview.py | 1 + safesite/views.py | 29 ++++++++++++++++++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/safesite/datashowview.py b/safesite/datashowview.py index ad133865..5e1ee4f2 100644 --- a/safesite/datashowview.py +++ b/safesite/datashowview.py @@ -22,6 +22,7 @@ from django.core.serializers.json import DjangoJSONEncoder from io import StringIO import operator import jwt + def area(req): userid = req.session['userid'] companyid = getcompany(userid) diff --git a/safesite/views.py b/safesite/views.py index d0df3241..8f2ee031 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -164,7 +164,7 @@ def upfile(req): # html页面 -def miniprogram(req): +def miniprogram(req, module): return HttpResponse('请您使用微信扫码打开') def safelist(req): @@ -2943,7 +2943,7 @@ def parthandle(req): if Partment.objects.filter(partlink__contains=','+a+',').exists() or User.objects.filter(ubelongpart=a).exists(): return JsonResponse({"code": 0}) else: - Partment.objects.get(partid=a).delete() + Partment.objects.filter(partid=a).delete() return JsonResponse({"code": 1}) elif req.GET.get('a') == 'addpart': if req.POST.get('partid') != '': @@ -3305,7 +3305,9 @@ def pxhandle(req): # 对many字段单独处理 str1 = [] for i in a.values('trainpart__partname'): - str1.append(i['trainpart__partname']) + if i: + str1.append(i['trainpart__partname']) + x['trainpart'] = ','.join(str1) if str1 else '' str2 = [] objs = Trainuser.objects.filter(train=a[0]) @@ -3525,8 +3527,13 @@ def gchandle(req): obj.safecontent = gcdata['safecontent'] obj.looknum = 'GC'+time.strftime('%Y%m%d%H%M%S') obj.usecomp = Partment.objects.get(partid=companyid) + gc_l = [] if 'lookimg' in gcdata: - obj.lookimg = '?'.join(gcdata['lookimg']) + for i in gcdata['lookimg']: + if i: + gc_l.append(i) + if gc_l: + obj.lookimg = '?'.join(gc_l) obj.save() if 'lookers' in gcdata: ulist = gcdata['lookers'].split(',') @@ -4147,8 +4154,12 @@ def apimiss(req): obj.lesson = data['lesson'] obj.missnum = 'WS'+time.strftime('%Y%m%d%H%M%S') obj.usecomp = Partment.objects.get(partid=companyid) + missimg_l = [] if 'missimg' in data and data['missimg']: - obj.missimg = '?'.join(data['missimg']) + for i in data['missimg']: + if i: + missimg_l.append(i) + obj.missimg = '?'.join(missimg_l) if missimg_l else '' obj.save() yjjs_ws.delay(companyid) return JsonResponse({"code": 1}) @@ -4679,6 +4690,7 @@ def apipartuser(req): 'checked': False, 'isPeople': True, 'children': []}) return JsonResponse({"code": 1, "data": lst}) +@apicheck_login def apiuser(req): a = req.GET.get('a') if a == 'detail': @@ -5997,8 +6009,11 @@ def apioperation(req): obj.zyzt['splc'][1]['sprs'] = [spr1] # 作业部门审批人 if spr2: obj.zyzt['splc'][2]['sprs'] = [spr2] # 属地部门审批人 - Operspxq.objects.create( - oper=obj, jdmc=obj.zyzt['splc'][oldindex]['jdmc'], spr=spruser, checked=1, spbm=spruser.ubelongpart) # 审批该步 + try: + Operspxq.objects.create( + oper=obj, jdmc=obj.zyzt['splc'][oldindex]['jdmc'], spr=spruser, checked=1, spbm=spruser.ubelongpart) # 审批该步 + except: + pass while nextindex < len(obj.zyzt['splc']): nextsplc = obj.zyzt['splc'][nextindex] if userid in nextsplc['sprs']: # 本人可审批直接跳过下一步