|
|
@@ -1234,7 +1234,8 @@ def member_activity_contribute_welfare_unlocking_list(request, administrator):
|
1234
|
1234
|
if welfare_id:
|
1235
|
1235
|
unlockings = unlockings.filter(welfare_id=welfare_id)
|
1236
|
1236
|
if query:
|
1237
|
|
- unlockings = unlockings.filter(Q(name__icontains=query) | Q(phone__icontains=query))
|
|
1237
|
+ users = MemberActivitySignupInfo.objects.values_list('user_id', flat=True).filter(name__icontains=query)
|
|
1238
|
+ unlockings = unlockings.filter(Q(name__icontains=query) | Q(phone__icontains=query) | Q(user_id__in=users))
|
1238
|
1239
|
if is_handled != '':
|
1239
|
1240
|
unlockings = unlockings.filter(is_handled=is_handled)
|
1240
|
1241
|
|