|
|
@@ -134,7 +134,9 @@ class LangWordView(TemplateView):
|
|
|
searchKey = request_dict.get('searchKey', None)
|
|
|
searchVal = request_dict.get('searchVal', None)
|
|
|
if page and line:
|
|
|
- la_qs = LangAreaModel.objects.filter().values('lang', 'id')
|
|
|
+ lang_set_list = LangSetModel.objects.filter(user__id=userID).values_list('lang__id', flat=True)
|
|
|
+ lang_set_list = list(lang_set_list)
|
|
|
+ la_qs = LangAreaModel.objects.filter(id__in=lang_set_list).values('lang', 'id')
|
|
|
lk_qs = LangKeyModel.objects.filter()
|
|
|
if searchKey and searchVal:
|
|
|
if searchKey == 'key':
|
|
|
@@ -143,7 +145,7 @@ class LangWordView(TemplateView):
|
|
|
lk_qs = lk_qs.filter(langvalmodel__word_val__contains=searchVal, langvalmodel__la__lang=searchKey)
|
|
|
count = lk_qs.count()
|
|
|
lk_qs = lk_qs[(page - 1) * line:page * line].values_list('word_key', flat=True)
|
|
|
- lv_qs = LangValModel.objects.filter(lk__word_key__in=lk_qs). \
|
|
|
+ lv_qs = LangValModel.objects.filter(lk__word_key__in=lk_qs,la__id__in=lang_set_list). \
|
|
|
values('word_val', 'la__id', 'la__lang', 'lk__word_key', 'lk__id')
|
|
|
lw_dict = {}
|
|
|
for lk in lk_qs:
|
chenjunkai