gitee
/
django-vue-admin
mirror of https://gitee.com/liqianglog/django-vue-admin
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

system消息通知:修复已读消息bug

pull/4/head
李强 2021-03-29 01:16:28 +08:00
parent 6ce0c3acdf
commit c9a34da1a5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dvadmin-backend/apps/vadmin/system/views.py
View File

@ -218,11 +218,12 @@ class MessagePushModelViewSet(CustomModelViewSet):
is_read = request.query_params.get('is_read', None) is_read = request.query_params.get('is_read', None)
if is_read: if is_read:
if is_read == 'False': if is_read == 'False':
queryset = queryset.filter(Q(messagepushuser_message_push__is_read=is_read) | Q(user=None)) queryset = queryset.exclude(Q(messagepushuser_message_push__is_read=True),
else: Q(messagepushuser_message_push__user=request.user))
queryset = queryset.filter(messagepushuser_message_push__is_read=is_read) elif is_read == 'True':
queryset = queryset.filter(messagepushuser_message_push__is_read=True,
queryset = queryset.filter(is_reviewed=True) messagepushuser_message_push__user=request.user)
queryset = queryset.filter(is_reviewed=True).distinct()
page = self.paginate_queryset(queryset) page = self.paginate_queryset(queryset)
if hasattr(self, 'handle_logging'): if hasattr(self, 'handle_logging'):
self.handle_logging(request, *args, **kwargs) self.handle_logging(request, *args, **kwargs)