Эх сурвалжийг харах

首页加载分享设备相关权限数据结构优化

zhangdongming 2 жил өмнө
parent
commit
5c31d66429

+ 11 - 4
Service/UserDeviceService.py

@@ -261,11 +261,18 @@ class UserDeviceService:
             if not channel_set_qs.exists() or not channels:
                 return channels
             channel_list = [int(val) for val in channel_set_qs[0]['channels'].split(',')]
-            channel_permission_qs = DeviceChannelUserPermission.objects.filter(channel_user_id=channel_set_qs[0]['id']) \
-                .values('permission_id')
+            channel_permission_qs = DeviceChannelUserPermission.objects \
+                .filter(channel_user_id=channel_set_qs[0]['id']).values('permission_id')
             ids = [val['permission_id'] for val in channel_permission_qs]
-            channel_permission_list = list(DeviceSharePermission.objects.filter(id__in=ids)
-                                           .values('id', 'code').order_by('sort'))
+            channel_permission_qs = DeviceSharePermission.objects \
+                .all().values('id', 'code').order_by('sort')
+            channel_permission_list = []
+            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})
             for item in channels:
                 channel = item['channel']
                 if channel in channel_list: