group/views.py

@@ -423,6 +423,7 @@ def flyimg_upload_api(request):

                 
              

                     group_photos = GroupPhotoInfo.objects.filter(
              

                         group_id=group_id,
              

                +        status=True,
              

                         pk__gt=max(current_id, group_user.current_id),
              

                     )
              

                     latest_photo = group_photos.last()
              
@@ -655,7 +656,7 @@ def pai2_home_api(request):

                     num = int(request.POST.get('num', settings.PAI2_HOME_PER_PAGE))
              

                 
              

                     cursor = connection.cursor()
              

                -    cursor.execute(r"select T1.group_id, T2.group_name, T2.group_default_avatar, T2.group_avatar, T3.id, T3.photo_path, T3.photo_w, T3.photo_h, T3.photo_thumbnail_path, T3.photo_thumbnail_w, T3.photo_thumbnail_h, T3.user_id, T3.nickname, T3.avatar, T3.comment_num, T3.thumbup_num, T3.created_at from (select * from group_groupuserinfo where user_id='{user_id}') as T1 left outer join group_groupinfo as T2 on T1.group_id = T2.group_id left outer join group_groupphotoinfo as T3 on T1.group_id = T3.group_id and T3.id > T1.current_id order by DATE(T3.created_at) desc, T3.thumbup_num desc limit {offset}, {rows};".format(
              

                +    cursor.execute(r"select T1.group_id, T2.group_name, T2.group_default_avatar, T2.group_avatar, T3.id, T3.photo_path, T3.photo_w, T3.photo_h, T3.photo_thumbnail_path, T3.photo_thumbnail_w, T3.photo_thumbnail_h, T3.user_id, T3.nickname, T3.avatar, T3.comment_num, T3.thumbup_num, T3.created_at from (select * from group_groupuserinfo where user_id='{user_id}') as T1 left outer join group_groupinfo as T2 on T1.group_id = T2.group_id left outer join group_groupphotoinfo as T3 on T1.group_id = T3.group_id and T3.status=1 and T3.id > T1.current_id order by DATE(T3.created_at) desc, T3.thumbup_num desc limit {offset}, {rows};".format(
              

                         user_id=user_id,
              

                         offset=0,
              

                         rows=settings.PAI2_HOME_MAX_ROWS,