1

Controller/UserBrandController.py

@@ -280,6 +280,7 @@ class MyserviceDynamodb(object):
                 FilterExpression=Attr('deviceSupplier').eq(username)
                                  | Key('osType').eq(username)
                                  | Key('deviceModel').eq(username)
+                                 | Key('userID').eq(username)
                                  | Key('osVersion').eq(username)
                                  | Key('country').eq(username)
                                  | Key('appId').eq(username)
@@ -293,6 +294,12 @@ class MyserviceDynamodb(object):
                                  | Key('ip').eq(username)
             )
             items = response['Items']
+            for k, v in enumerate(items):
+                user_ID = Device_User.objects.filter(username=items[k]['userID']).values('userID', 'username', 'NickName')
+                try:
+                    items[k]['username'] = user_ID[0]['userID']
+                except Exception:
+                    items[k]['username'] = ''
         except Exception as e:
             logger.error("Failed to get table {0}, error".format(table_name, e))
         return items
@@ -350,7 +357,6 @@ class MyserviceDynamodb(object):
                     Key={
                         'userID': user_id,
                         'username': user_name,
-
                     }
                 )
             else:
@@ -572,7 +578,6 @@ class UserBrandInfo(View):
             page_value=[]
             if check_perm is True:
                 if username is None or username is '':
-                    print ('')
                     # table_Limit_value = my.get_page_line(page,line,user_brand,None,page_value)
                     # # 页面减1
                     # page = page-1
@@ -586,6 +591,11 @@ class UserBrandInfo(View):
                     return response.json(0, {'datas': {}, 'count': 0})
                 else:
                     # 查询
+                    user_ID = Device_User.objects.filter(username=username).values('userID','username', 'NickName')
+                    try:
+                        username = user_ID[0]['userID']
+                    except Exception:
+                        username = username
                     table_value = my.get_item(user_brand ,username)
                     return response.json(0, {'datas': table_value, 'count': len(table_value)})
             else:
@@ -634,8 +644,15 @@ class UserBrandInfo(View):
                     return response.json(0, {'datas': {}, 'count': 0})
                 else:
                     # 查询
+                    user_ID = Device_User.objects.filter(username=username).values('userID','username', 'NickName')
+                    try:
+                        username = user_ID[0]['userID']
+                    except Exception:
+                        username = username
                     table_value = my.get_item(user_brand_all, username)
-                    return response.json(0, {'datas': table_value, 'count': len(table_value)})
+
+
+                    return response.json(0, {'username': name, 'datas': table_value, 'count': len(table_value)})
             else:
                 return response.json(404)
         else: