From 705bf13343ab2408f70f9bbd334a8888bab60e80 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 26 May 2021 16:20:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4grouptype3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 groups/views.py   |  2 +-
 safesite/views.py | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/groups/views.py b/groups/views.py
index 46e26bf6..eb30244f 100644
--- a/groups/views.py
+++ b/groups/views.py
@@ -183,7 +183,7 @@ class CompanyCreateView(CreateView):
                 menus = list(role.permissions.all().values_list('menuid',flat=True))
                 s_models.Group.objects.create(groupname='超管', grouptype=0, usecomp=obj, menulist=menus)
                 s_models.Group.objects.create(groupname='安全员', grouptype=1, usecomp=obj, menulist=menus)
-                s_models.Group.objects.create(groupname='全体用户', grouptype=3, usecomp=obj, menulist=menus)
+                # s_models.Group.objects.create(groupname='全体用户', grouptype=3, usecomp=obj, menulist=[11])
                 z = s_models.Group.objects.create(groupname='主管', grouptype=2,usecomp=obj, menulist=menus)
                 z.users.add(adminuser)
                 s_models.Yjsetup.objects.create(monthyhavg=100, safev=50, warnv=75, alertv=100, maxv=200, yhpgqz=4,
diff --git a/safesite/views.py b/safesite/views.py
index a75df7b7..8783df73 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -2814,8 +2814,8 @@ def userhandle(req):
                 #         if i.grouptype == 1:
 
                 #         i.users.add(a)
-                Group.objects.get(usecomp__partid=companyid,
-                                  grouptype=3).users.add(a)
+                # Group.objects.get(usecomp__partid=companyid,
+                #                   grouptype=3).users.add(a)
                 return JsonResponse({"code": 1})
             else:
                 return JsonResponse({"code": 0})
@@ -3936,8 +3936,6 @@ def apicompany(req):
                     groupname='超管', grouptype=0, usecomp=part, menulist=menurights)
                 Group.objects.create(
                     groupname='安全员', grouptype=1, usecomp=part, menulist=menurights)
-                Group.objects.create(
-                    groupname='全体用户', grouptype=3, usecomp=part, menulist=menurights)
                 z = Group(groupname='主管', grouptype=2,
                           usecomp=part, menulist=menurights)
                 z.save()
@@ -4646,7 +4644,7 @@ def apiuser(req):
         user = User.objects.get(userid=ruserid)
         user.deletemark=1
         user.save()
-        Group.objects.get(usecomp=user.usecomp,grouptype=3).users.add(user)#授予基本权限
+        # Group.objects.get(usecomp=user.usecomp,grouptype=3).users.add(user)#授予基本权限
         return JsonResponse({"code": 1})
     elif a == 'updateHeadimg':
         userid = req.GET.get('userid')
@@ -4968,8 +4966,8 @@ def apitool(req):
         user.save()
         for i in Group.objects.filter(usecomp=usecomp):
             i.users.remove(user)
-        groupobj = Group.objects.filter(usecomp=usecomp, grouptype=3).first()
-        groupobj.users.add(user)
+        # groupobj = Group.objects.filter(usecomp=usecomp, grouptype=3).first()
+        # groupobj.users.add(user)
         return JsonResponse({"code": 1})
     elif a == 'correctionzs':
         objs = Socertificate.objects.all()