优化分享设备

Controller/DeviceShare.py

@@ -231,10 +231,10 @@ class DeviceShareView(View):
                                                             updTime=now_time, uid_set_id=uid_set_id)
                         else:
                             gateway_push_qs = GatewayPush.objects.filter(user_id=userID, logout=False).values(
-                                'app_app_id', 'm_code', 'app_type', 'push_type', 'token_val', 'lang', 'jg_token_val',
+                                'app_bundle_id', 'm_code', 'app_type', 'push_type', 'token_val', 'lang', 'jg_token_val',
                                 'tz')
                             for item in gateway_push_qs:
-                                UidPushModel.objects.create(userID_id=userID, appBundleId=item['app_app_id'],
+                                UidPushModel.objects.create(userID_id=userID, appBundleId=item['app_bundle_id'],
                                                             app_type=item['app_type'], addTime=now_time,
                                                             push_type=item['push_type'], updTime=now_time,
                                                             token_val=item['token_val'], uid_set_id=uid_set_id,

Controller/shareUserPermission.py

@@ -265,7 +265,7 @@ class shareUserEquipmentView(View):
             try:
                 Device_Info.objects.bulk_create(querysetList)
                 DeviceUserPermissions.objects.bulk_create(permission_list)
-                uid_set_qs = UidSetModel.objects.filter(uid=uid_push_list).values('id')
+                uid_set_qs = UidSetModel.objects.filter(uid__in=uid_push_list).values('id')
                 for uid_set in uid_set_qs:
                     uid_set_id = uid_set['id']
                     now_time = int(time.time())
@@ -281,10 +281,10 @@ class shareUserEquipmentView(View):
                                                         updTime=now_time, uid_set_id=uid_set_id)
                     else:
                         gateway_push_qs = GatewayPush.objects.filter(user_id=GuestID, logout=False).values(
-                            'app_app_id', 'm_code', 'app_type', 'push_type', 'token_val', 'lang', 'jg_token_val',
+                            'app_bundle_id', 'm_code', 'app_type', 'push_type', 'token_val', 'lang', 'jg_token_val',
                             'tz')
                         for item in gateway_push_qs:
-                            UidPushModel.objects.create(userID_id=GuestID, appBundleId=item['app_app_id'],
+                            UidPushModel.objects.create(userID_id=GuestID, appBundleId=item['app_bundle_id'],
                                                         app_type=item['app_type'], addTime=now_time,
                                                         push_type=item['push_type'], updTime=now_time,
                                                         token_val=item['token_val'], uid_set_id=uid_set_id,