作者 wanweibin

update

@@ -62,8 +62,8 @@ class ProjectDetail(RetrieveAPIView): @@ -62,8 +62,8 @@ class ProjectDetail(RetrieveAPIView):
62 res = i.result_auditor.filter(project=obj).values('is_accept', 'memo').first() 62 res = i.result_auditor.filter(project=obj).values('is_accept', 'memo').first()
63 obj.result.append({ 63 obj.result.append({
64 "auditor": i.user.username, 64 "auditor": i.user.username,
65 - "is_accept": res['is_accept'],  
66 - "memo": res['memo'], 65 + "is_accept": res['is_accept'] if res else None,
  66 + "memo": res['memo'] if res else '',
67 }) 67 })
68 return response(ProjectSerializer(obj).data) 68 return response(ProjectSerializer(obj).data)
69 69
@@ -149,5 +149,11 @@ class CheckAuth(APIView): @@ -149,5 +149,11 @@ class CheckAuth(APIView):
149 149
150 @staticmethod 150 @staticmethod
151 def get(request, *args, **kwargs): 151 def get(request, *args, **kwargs):
152 - project_auditor = Project.objects.filter(pk=kwargs['pk'], auditor__user_id=request.user.id)  
153 - return response(True) if project_auditor else response(False) 152 + project_auditor = Project.objects.filter(
  153 + pk=kwargs['pk'],
  154 + auditor__user_id=request.user.id)
  155 + auditor_res = Result.objects.filter(auditor__user_id=request.user.id, project_id__exact=kwargs['pk'])
  156 + if not project_auditor:
  157 + return response(True)
  158 + else:
  159 + return response(False) if auditor_res else response(True)