Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

hb_server/apps/inm/views.py

@@ -82,8 +82,7 @@ class FIFOItemViewSet(ListModelMixin, CreateModelMixin, DestroyModelMixin, Updat
     """
     出入库记录详情表
     """
-    perms_map = {'get': '*', 'post':'fifoitem_create', 
-                'put':'fifoitem_update', 'delete':'fifoitem_delete'}
+    perms_map = {'*':'*'}
     queryset = FIFOItem.objects.select_related('material', 'fifo').prefetch_related('files').all()
     serializer_class = FIFOItemSerializer
     filterset_fields = ['material', 'fifo',

hb_server/apps/system/permission.py

@@ -8,17 +8,21 @@ def get_permission_list(user):
     """
     获取权限列表,可用redis存取
     """
-    perms_list = ['visitor']
+    perms_list = []
     if user.is_superuser:
         perms_list = ['admin']
     else:
-        perms = Permission.objects.none()
+        perms = Permission.objects.filter()
         roles = user.roles.all()
         if roles:
             for i in roles:
                 perms = perms | i.perms.all()
-        perms_list = perms.values_list('method', flat=True)
-        perms_list = list(set(perms_list))
+        perms_list_l = perms.values_list('method', flat=True)
+        for i in perms_list_l:
+            if i and i not in perms_list:
+                perms_list.append(i)
+    if len(perms_list) == 0:
+        perms_list = ['visitor']
     cache.set(user.username + '__perms', perms_list, 60*60)
     return perms_list