wushaodong 4 vuotta sitten
vanhempi
sitoutus
24fc546b6a
2 muutettua tiedostoa jossa 6 lisäystä ja 1 poistoa
  1. 5 1
      apps/wxapp/inspection_order/views.py
  2. 1 0
      apps/wxapp/tenant/views.py

+ 5 - 1
apps/wxapp/inspection_order/views.py

@@ -16,7 +16,7 @@ from apps.tenant import tenant_log
 
 class InspectionOrderDetailView(generics.RetrieveAPIView):
     permission_classes = [isLogin, ]
-    queryset = InspectionOrder.objects.filter(status=InspectionOrder.NOT_REPAIR)
+    queryset = InspectionOrder.objects.filter()
     serializer_class = InspectionOrderDetailSerializer
 
     def retrieve(self, request, *args, **kwargs):
@@ -24,6 +24,10 @@ class InspectionOrderDetailView(generics.RetrieveAPIView):
         serializer = self.get_serializer(instance)
         return response_ok(serializer.data)
 
+    def filter_queryset(self, queryset):
+        # queryset = queryset.filter(tenant=self.request.user.employee.tenant, user=self.request.user)
+        f = InspectionOrderFilter(self.request.GET, queryset=queryset)
+        return f.qs
 
 class InspectionOrderAllView(generics.ListAPIView):
     permission_classes = [isLogin, ]

+ 1 - 0
apps/wxapp/tenant/views.py

@@ -34,6 +34,7 @@ class GetTenantView(APIView):
         emplayee = Employee.objects.filter(user=request.user).first()
         if emplayee:
             data = {
+                'tenant_id':emplayee.tenant.id,
                 'company_no':emplayee.tenant.company_no,
                 'company_name':emplayee.tenant.company_name,
                 'position':emplayee.position,