|
|
@@ -1,5 +1,4 @@
|
|
|
import os
|
|
|
-import base64
|
|
|
import simplejson as json
|
|
|
import time
|
|
|
from django.utils import timezone
|
|
|
@@ -14,8 +13,7 @@ from Object.TokenObject import TokenObject
|
|
|
from Object.UrlTokenObject import UrlTokenObject
|
|
|
from Service.CommonService import CommonService
|
|
|
from Service.ModelService import ModelService
|
|
|
-from var_dump import var_dump
|
|
|
-
|
|
|
+from django.db.models import Q
|
|
|
'''
|
|
|
http://192.168.136.45:8077/equipment/OTA?token=test&operation=query&page=1&line=10
|
|
|
http://192.168.136.45:8077/equipment/OTA?token=test&operation=find&page=1&line=10&content={}
|
|
|
@@ -367,7 +365,10 @@ class EquipmentVersionView(View):
|
|
|
if code:
|
|
|
ev_qs = ev_qs.filter(code__contains=code)
|
|
|
if lang:
|
|
|
- ev_qs = ev_qs.filter(lang=lang)
|
|
|
+ if lang == 'cn' or lang == 'zh-Hans':
|
|
|
+ ev_qs = ev_qs.filter(Q(lang=lang) | Q(lang=lang))
|
|
|
+ else:
|
|
|
+ ev_qs = ev_qs.filter(lang=lang)
|
|
|
count = ev_qs.count()
|
|
|
ev_qs = ev_qs[(page - 1) * line:page * line].values()
|
|
|
ev_ls = CommonService.qs_to_list(ev_qs)
|
chenjunkai