Commit e7ec5d5e authored by xianyang's avatar xianyang

12-11: 优化朋友圈列表,增加返回字段

parent 65f81741
......@@ -37,7 +37,11 @@ def get_infoname(data):
result = []
uids = [item.get("uid", "") for item in data]
if uids:
sql = f"SELECT nickname,user_avatar_file_name,bg_image,user_uid FROM `missu_users` where user_uid in{tuple(uids)}"
if len(uids) == 1:
sql = f"SELECT nickname,user_avatar_file_name,bg_image,user_uid,energy_ball_image FROM missu_users where user_uid={uids[0]}"
else:
sql = f"SELECT nickname,user_avatar_file_name,bg_image,user_uid,energy_ball_image FROM missu_users where user_uid in{tuple(uids)}"
user_info = LinkMysql(env.BUSINESS).query_mysql(sql)
for i in range(len(data)):
for s in range(len(user_info)):
......@@ -46,6 +50,7 @@ def get_infoname(data):
data[i]['nick_name'] = user_info[s].get("nickname", "")
data[i]['user_avatar_file_name'] = user_info[s].get("user_avatar_file_name", "")
data[i]['bg_image'] = data[s].get("bg_image", "")
data[i]['energy_ball_image'] = data[s].get("energy_ball_image", "")
result.append(data[i])
return result
......
......@@ -30,7 +30,7 @@ def friends_list():
form = FriendsListFrom(request.args).validate_()
page = request.args.get('page', default=1, type=int)
limit = request.args.get('size', default=10, type=int)
query_user = FriendMessage.query.filter(audit_status=2).order_by(FriendMessage.id.desc())
query_user = FriendMessage.query.filter().order_by(FriendMessage.id.desc())
if form.params:
query_user = query_user.filter(*form.params)
paginate = query_user.paginate(page=page, per_page=limit, error_out=True)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment