Merge branch 'master' of http://git.zzliaoyuan.com:4000/wushaodong/decorate

apps/agent/views.py

@@ -124,17 +124,17 @@ class AgentDictView(APIView):
     permission_classes = [isLogin, ]
 
     def get(self, request):
-        general_agent = GeneralAgent.objects.filter(Q(create_user=request.user) | Q(id=request.user.general_agent_id))
-        general_agents = GeneralAgentComboboxSerializer(general_agent, many=True).data
-
-        rows = Agent.objects.filter(Q(create_user=request.user) | Q(id=request.user.agent_id))
-        agents = AgentComboboxSerializer(rows, many=True).data
-        stores = []
-
-        for row in rows:
-            store = Store.objects.filter(agent=row, enable=True, end_date__gte=timezone.now().date())
-            store_serializer = StoreComboboxSerializer(store, many=True).data
-            stores.extend(store_serializer)
+        general_agent_rows = GeneralAgent.objects.filter(Q(create_user=request.user) | Q(id=request.user.general_agent_id))
+        general_agents = GeneralAgentComboboxSerializer(general_agent_rows, many=True).data
+        for general_agent_row in general_agent_rows:
+            rows = Agent.objects.filter(general_agent=general_agent_row)
+            agents = AgentComboboxSerializer(rows, many=True).data
+            stores = []
+
+            for row in rows:
+                store = Store.objects.filter(agent=row, enable=True, end_date__gte=timezone.now().date())
+                store_serializer = StoreComboboxSerializer(store, many=True).data
+                stores.extend(store_serializer)
         return response_ok({
             'general_agents': general_agents,
             'agents': agents,