|
@@ -261,11 +261,18 @@ class UserDeviceService:
|
|
if not channel_set_qs.exists() or not channels:
|
|
if not channel_set_qs.exists() or not channels:
|
|
return channels
|
|
return channels
|
|
channel_list = [int(val) for val in channel_set_qs[0]['channels'].split(',')]
|
|
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]
|
|
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:
|
|
for item in channels:
|
|
channel = item['channel']
|
|
channel = item['channel']
|
|
if channel in channel_list:
|
|
if channel in channel_list:
|