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

apps/account/views.py

@@ -284,6 +284,7 @@ class EmployeeTreeView(APIView):
                     }
                     general_agent_item['children'].append(general_agent_user_item)
                 employee_data.append(general_agent_item)
+
         agents = agents.values('id', 'name')
         for agent in agents:
             agent_item = {
@@ -300,7 +301,7 @@ class EmployeeTreeView(APIView):
                     'field': 'agent_user',
                 }
                 agent_item['children'].append(agent_user_item)
-            stores = stores.values('id', 'name')
+            stores = stores.filter(agent_id=agent['id'], enable=True).values('id', 'name')
             for store in stores:
                 store_item = {
                     'title': store['name'],