Browse Source

优化通道权限数据结构

zhangdongming 2 years ago
parent
commit
cde8ffb6cc
1 changed files with 8 additions and 2 deletions
  1. 8 2
      Service/UserDeviceService.py

+ 8 - 2
Service/UserDeviceService.py

@@ -267,16 +267,22 @@ class UserDeviceService:
             channel_permission_qs = DeviceSharePermission.objects \
                 .all().values('id', 'code').order_by('sort')
             channel_permission_list = []
+            default_permissions = []
             if not channel_permission_qs.exists():
                 return channels
 
             for item in channel_permission_qs:
-                channel_permission_list.append({'permissionId': item['id'], 'code': item['code'],
-                                                'isSelect': 1 if item['id'] in ids else 0})
+                data = {'permissionId': item['id'], 'code': item['code'], 'isSelect': 0}
+                default_permissions.append(data)
+                data['isSelect'] = 1 if item['id'] in ids else 0
+                channel_permission_list.append(data)
+
             for item in channels:
                 channel = item['channel']
                 if channel in channel_list:
                     item['channelPermissions'] = channel_permission_list
+                else:
+                    item['channelPermissions'] = default_permissions
             return channels
         except Exception as e:
             LOGGER.info('异常详情,errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))