Commit 0ffd587c authored by lvshibao's avatar lvshibao

获取team修改

parent 08f03226
...@@ -69,7 +69,10 @@ class AgencyApi(viewsets.ViewSet): ...@@ -69,7 +69,10 @@ class AgencyApi(viewsets.ViewSet):
top = Country.objects.filter(id=city_id).first() top = Country.objects.filter(id=city_id).first()
if top is not None: if top is not None:
if top.parent is None: if top.parent is None:
pass countries = Country.objects.filter().all()
for country in countries:
if len(Team.objects.filter(country=country.id).all()) > 0:
country_list.append({'id': country.id, 'name': country.name})
else: else:
countries = Country.objects.filter(parent=city_id).all() countries = Country.objects.filter(parent=city_id).all()
for country in countries: for country in countries:
...@@ -92,7 +95,7 @@ class AgencyApi(viewsets.ViewSet): ...@@ -92,7 +95,7 @@ class AgencyApi(viewsets.ViewSet):
top = Country.objects.filter(id=city_id).first() top = Country.objects.filter(id=city_id).first()
if top is not None: if top is not None:
if top.parent is None: if top.parent is None:
pass team_list = Team.objects.filter().values('id', 'name')
elif country_id is None or country_id == '': elif country_id is None or country_id == '':
country_ids = Country.objects.filter(parent=city_id).values_list('id', flat=True) country_ids = Country.objects.filter(parent=city_id).values_list('id', flat=True)
team_list = Team.objects.filter(Q(country_id=city_id) | Q(country_id__in=country_ids)).values('id', team_list = Team.objects.filter(Q(country_id=city_id) | Q(country_id__in=country_ids)).values('id',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment