Bladeren bron

修改对比主用户代码

linhaohong 9 maanden geleden
bovenliggende
commit
9833dc4b7f
1 gewijzigde bestanden met toevoegingen van 5 en 6 verwijderingen
  1. 5 6
      Controller/CampaignController/AdDepartmentController.py

+ 5 - 6
Controller/CampaignController/AdDepartmentController.py

@@ -81,16 +81,15 @@ class AdDepartmentView(View):
             # 构造返回的用户信息列表
             user_info_list = []
             for user in paginated_users:
-                device_list = [
-                    {
+                device_list = []
+                for device in user.device_info_set.all():
+                    device_list.append({
                         "uid": device.UID,
                         "serialNumber": device.serial_number,
                         "addTime": device.data_joined,
                         "isShared": device.isShare,
-                        "isPrimaryUser": user.userID == device.primaryUserID,
-                    }
-                    for device in user.device_info_set.all()  # 使用预加载的设备信息
-                ]
+                        "isPrimaryUser": user.userID == device.vodPrimaryUserID or user.userID == device.primaryUserID,
+                    })
 
                 user_info_list.append({
                     "username": user.username,