|
|
@@ -369,17 +369,24 @@ class EmployeeTreeView2(APIView):
|
|
|
'field': 'agent',
|
|
|
'children': agent_dict[agent['id']] ,
|
|
|
}
|
|
|
- # 当前用户有代理商没有门店，则是代理商账号。此时加载和代理商平行的账号
|
|
|
- if not request.user.store and request.user.agent:
|
|
|
+
|
|
|
+ if not request.user.agent:
|
|
|
+ # 当前用户有代理商。此时加载和总代理平行的账号
|
|
|
+ agent_users = User.objects.filter(agent__isnull=False, is_active=True, store__isnull=True)
|
|
|
+ elif not request.user.store:
|
|
|
+ # 当前用户有门店。此时加载和代理商平行的账号
|
|
|
agent_users = User.objects.filter(agent_id=agent['id'], is_active=True, store__isnull=True)
|
|
|
- for agent_user in agent_users:
|
|
|
- if agent_user.has_perm('customer.inner_review'):
|
|
|
- agent_user_item = {
|
|
|
- 'title': agent_user.name,
|
|
|
- 'id': agent_user.id,
|
|
|
- 'field': 'user',
|
|
|
- }
|
|
|
- agent_item['children'].insert(0,agent_user_item)
|
|
|
+ else:
|
|
|
+ # 有门店和代理商，这是店内人员。不需要在加载任何账号
|
|
|
+ agent_users = []
|
|
|
+ for agent_user in agent_users:
|
|
|
+ if agent_user.has_perm('customer.inner_review'):
|
|
|
+ agent_user_item = {
|
|
|
+ 'title': agent_user.name,
|
|
|
+ 'id': agent_user.id,
|
|
|
+ 'field': 'user',
|
|
|
+ }
|
|
|
+ agent_item['children'].insert(0,agent_user_item)
|
|
|
|
|
|
try:
|
|
|
general_agent_dict[agent['general_agent_id']].append(agent_item)
|
|
|
@@ -410,9 +417,9 @@ class EmployeeTreeView2(APIView):
|
|
|
general_agent_item['children'].insert(0, general_agent_user_item)
|
|
|
data.append(general_agent_item)
|
|
|
# 总代理只有一级，去掉总代理
|
|
|
- if len(data) == 1:
|
|
|
- data = data[0]['children']
|
|
|
+ # if len(data) == 1:
|
|
|
+ # data = data[0]['children']
|
|
|
# 代理只有一级，去掉代理
|
|
|
- if len(data) == 1:
|
|
|
- data = data[0]['children']
|
|
|
+ # if len(data) == 1:
|
|
|
+ # data = data[0]['children']
|
|
|
return response_ok(data)
|
wushaodong