Quellcode durchsuchen

筛选空字段

peng vor 1 Jahr
Ursprung
Commit
1e731037df
1 geänderte Dateien mit 12 neuen und 10 gelöschten Zeilen
  1. 12 10
      controller/LangWord.py

+ 12 - 10
controller/LangWord.py

@@ -25,6 +25,7 @@ import time
 from object.TokenObject import TokenObject
 from django.db.models import Q
 
+
 class LangWordView(TemplateView):
     def post(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
@@ -41,7 +42,7 @@ class LangWordView(TemplateView):
     def validate(self, request_dict, operation):
         response = ResponseObject()
         print('request_dict:', request_dict)
-        print('operation:',operation)
+        print('operation:', operation)
         token = request_dict.get('token', None)
         tko = TokenObject(token)
         # print('tko:',tko.userID)
@@ -92,7 +93,7 @@ class LangWordView(TemplateView):
                 print(type)
                 if lk[0].type & word_key_type != 0:
                     var_dump(list(lk))
-                    return response.json(473,'key已存在')
+                    return response.json(473, 'key已存在')
                 else:
                     type = word_key_type | lk[0].type
                     data = {
@@ -210,7 +211,7 @@ class LangWordView(TemplateView):
         orderByupdate = request_dict.get('orderByupdate', 0)
         if page and line:
             lang_set_list = LangSetModel.objects.filter(user__id=userID).values_list('lang__id', flat=True)
-            print('lang_set_list:',lang_set_list)
+            print('lang_set_list:', lang_set_list)
             lang_set_list = list(lang_set_list)
             print('lang_set_list:', lang_set_list)
             la_qs = LangAreaModel.objects.filter(id__in=lang_set_list).values('lang', 'id')
@@ -231,7 +232,10 @@ class LangWordView(TemplateView):
                     lk_qs = lk_qs.filter(word_key__contains=searchVal)
                     # lk_qs = lk_qs.filter(word_key=searchVal)
                 else:
-                    lk_qs = lk_qs.filter(langvalmodel__word_val__contains=searchVal, langvalmodel__la__lang=searchKey)
+                    if searchVal == ' ':
+                        lk_qs = lk_qs.filter(langvalmodel__word_val='', langvalmodel__la__lang=searchKey)
+                    else:
+                        lk_qs = lk_qs.filter(langvalmodel__word_val__contains=searchVal, langvalmodel__la__lang=searchKey)
             if orderByupdate == 1:
                 lk_qs = lk_qs.order_by('updTime')
             else:
@@ -244,9 +248,9 @@ class LangWordView(TemplateView):
             for lk in lk_qs:
                 k_list.append(lk['word_key'])
                 lw_dict[lk['word_key']] = {'updTime': lk['updTime']}
-            print('k_list:',k_list)
+            print('k_list:', k_list)
             lv_qs = LangValModel.objects.filter(lk__word_key__in=k_list, la__id__in=lang_set_list). \
-                values('word_val', 'la__id', 'la__lang', 'lk__word_key', 'lk__id', 'status').order_by('word_val')
+                values('word_val', 'la__id', 'la__lang', 'lk__word_key', 'lk__id', 'status')
             print('lv_qs:', lv_qs)
             user = UserModel.objects.get(id=userID)
             lang_perm_ql = LangPermModel.objects.filter(user__id=userID).values_list('lang__lang', flat=True)
@@ -270,7 +274,7 @@ class LangWordView(TemplateView):
                 # 'lv_list': list(lv_qs)
                 'count': count
             }
-            print('res:',res)
+            print('res:', res)
             return response.json(0, res)
         else:
             return response.json(444, 'page,line')
@@ -294,8 +298,6 @@ class LangWordView(TemplateView):
                 lv_qs.update(status=0)
                 return response.json(0)
             else:
-                return response.json(10,"数据已重置")
+                return response.json(10, "数据已重置")
         else:
             return response.json(404)
-
-