api/member_views.py

@@ -551,16 +551,20 @@ def activity_contribute_list(request):

                     activity_id = request.POST.get('activity_id', '')
              

                     content_type = get_query_value(request, 'content_type', val_cast_type='int')
              

                     is_selected = get_query_value(request, 'is_selected', val_cast_type='int')
              

                +    is_myself = get_query_value(request, 'is_myself', val_cast_type='int')
              

                +    is_audit_pass = get_query_value(request, 'is_audit_pass', val_cast_type='int')
              

                     page = request.POST.get('page', 1)
              

                     num = request.POST.get('num', 20)
              

                 
              

                -    contributions = MemberActivityContributionInfo.objects.filter(content_type=content_type, is_audit_pass=True, status=True)
              

                -    if user_id:
              

                +    contributions = MemberActivityContributionInfo.objects.filter(activity_id=activity_id, status=True)
              

                +    if content_type != '':
              

                +        contributions.filter(content_type=content_type)
              

                +    if is_audit_pass != '':
              

                +        contributions = contributions.filter(is_audit_pass=is_audit_pass)
              

                +    if is_myself:
              

                         contributions = contributions.filter(user_id=user_id)
              

                -    if activity_id:
              

                -        contributions = contributions.filter(activity_id=activity_id)
              

                -    if is_selected:
              

                -        contributions = contributions.filter(is_selected=True)
              

                +    if is_selected != '':
              

                +        contributions = contributions.filter(is_selected=is_selected)
              

                     contributions = contributions.order_by('-pk')
              

                     contributions, left = pagination(contributions, page, num)
              

                     contributions = [contribution.data for contribution in contributions]