Merge https://e.coding.net/ctcdevteam/safesite

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)

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/<str:module>', views.miniprogram),
 ]

safesite/views.py

@@ -164,6 +164,9 @@ def upfile(req):
 
 # html页面
 
+def miniprogram(req, module):
+    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 登出' %
+        # logger.info('method: %s user: %s 登出' %
-                    (req.method, req.session['userid']))
+        #             (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')
@@ -2940,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') != '':
@@ -3302,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])
@@ -3522,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(',')
@@ -4144,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})
@@ -4676,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':
@@ -5994,8 +6009,11 @@ def apioperation(req):
                 obj.zyzt['splc'][1]['sprs'] = [spr1]  # 作业部门审批人
             if spr2:
                 obj.zyzt['splc'][2]['sprs'] = [spr2]  # 属地部门审批人
-        Operspxq.objects.create(
+        try:
-            oper=obj, jdmc=obj.zyzt['splc'][oldindex]['jdmc'], spr=spruser, checked=1, spbm=spruser.ubelongpart)  # 审批该步
+            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']:  # 本人可审批直接跳过下一步