Merge remote-tracking branch 'origin/master'

apps/customer/views.py

@@ -177,10 +177,11 @@ class StageCountView(APIView):
         data = []
         stage_progress = Option.objects.filter(type=Option.STAGE_PROGRESS, enable=True).order_by('sort')
         user = request.user
-        users = User.objcets.filter(store_id__in=request.user.get_manager_range())
         time_now = timezone.now().strftime('%Y-%m-%d')
         for stage in stage_progress:
-            new_customers = NewCustomer.objects.filter(Q(track_user=user)|Q(track_user=users), stage_progress=stage)
+            new_customers = NewCustomer.objects.filter(Q(track_user=user) |
+                                                       Q(track_user__store_id__in=request.user.get_manager_range()),
+                                                       stage_progress=stage)
             stage_count = {
                 'stage': stage.name,    # 阶段名称
                 'total': new_customers.count(),   # 总人数