From 771259ac43f989dc4b650fa24b46b003dc250cf6 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 25 Dec 2019 17:37:08 +0800
Subject: [PATCH] menu button control complete

---
 safesite/views.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/safesite/views.py b/safesite/views.py
index b88b1e9f..ec66a61e 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -531,7 +531,6 @@ def init_permission(user,req):
                                         'id': item.menuid,
                                         'name': item.menuname,
                                         })
-    print(permission_dict)
     req.session['permissions'] = permission_dict
 
 
@@ -846,7 +845,7 @@ def apirights(req):
         for i in data:
             rlist.append(i['id'])
         Group.objects.filter(groupid=groupid).update(
-            menulist=rlist)
+            menulist=list(set(rlist)))
         return JsonResponse({"code": 1})
     elif a == 'have':
         userid = req.session['userid']
@@ -4720,7 +4719,7 @@ def apitool(req):
         return JsonResponse({"code": 1})
     elif a == 'correct_menuhas':
         buttons = Menu.objects.filter(type=2)
-        for group in Group.objects.filter(grouptype=0):
+        for group in Group.objects.all():
             menulist = group.menulist
             for button in buttons:
                 if button.parentid.menuid in menulist: #如果菜单在所拥有权限内