Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

server/apps/vod/views.py

@@ -114,7 +114,14 @@ class MyViewRecordAPIView(APIView):
             video = Video.objects.get(pk=id)
         except:
             return Response('视频不存在', status=HTTP_400_BAD_REQUEST)
-        record, fcreated = ViewRecord.objects.get_or_create(video=video, user=request.user, defaults={'video':video, 'user':request.user})
+        
+        record = ViewRecord.objects.filter(video=video, user=request.user).first()
+        fcreated = False
+        if record:
+            fcreated = True
+        else:
+            record = ViewRecord.objects.create(video=video, user=request.user)
+
         if fcreated:
             video.viewsp = video.viewsp + 1
             video.views = video.views + 1