|
@@ -137,7 +137,7 @@ class CDKView(View):
|
|
if not lang:
|
|
if not lang:
|
|
lang = 'cn'
|
|
lang = 'cn'
|
|
|
|
|
|
- cdk_qs = cdk_qs.filter(is_activate=searchVal,rank__lang__lang=lang)
|
|
|
|
|
|
+ cdk_qs = cdk_qs.filter(rank__lang__lang=lang)
|
|
cdk_qs = cdk_qs.annotate(rank__title=F('rank__lang__title'))
|
|
cdk_qs = cdk_qs.annotate(rank__title=F('rank__lang__title'))
|
|
cdk_qs = cdk_qs.values('id', 'cdk', 'create_time', 'valid_time', 'is_activate', 'rank__id', 'rank__title', 'order',
|
|
cdk_qs = cdk_qs.values('id', 'cdk', 'create_time', 'valid_time', 'is_activate', 'rank__id', 'rank__title', 'order',
|
|
'create_time')
|
|
'create_time')
|
|
@@ -195,7 +195,7 @@ class CDKView(View):
|
|
if not lang:
|
|
if not lang:
|
|
lang = 'cn'
|
|
lang = 'cn'
|
|
|
|
|
|
- cdk_qs = cdk_qs.filter(is_activate=searchVal, rank__lang__lang=lang)
|
|
|
|
|
|
+ cdk_qs = cdk_qs.filter(rank__lang__lang=lang)
|
|
cdk_qs = cdk_qs.annotate(rank__title=F('rank__lang__title'))
|
|
cdk_qs = cdk_qs.annotate(rank__title=F('rank__lang__title'))
|
|
cdk_qs = cdk_qs.values('id', 'cdk', 'create_time', 'valid_time', 'is_activate', 'rank__id',
|
|
cdk_qs = cdk_qs.values('id', 'cdk', 'create_time', 'valid_time', 'is_activate', 'rank__id',
|
|
'rank__title', 'order',
|
|
'rank__title', 'order',
|