修复newSearchTool语言下载内容格式不正确的问题

controller/LangWord.py

@@ -40,8 +40,11 @@ class LangWordView(TemplateView):
 
     def validate(self, request_dict, operation):
         response = ResponseObject()
+        print('request_dict:', request_dict)
+        print('operation:',operation)
         token = request_dict.get('token', None)
         tko = TokenObject(token)
+        # print('tko:',tko.userID)
         if tko.code == 0:
             userID = tko.userID
             if operation == 'add':
@@ -205,7 +208,9 @@ 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)
             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')
 
             print(langType)
@@ -213,7 +218,7 @@ class LangWordView(TemplateView):
             print(tmpType)
             if tmpType == 0:
                 lk_qs = LangKeyModel.objects.filter(type__in=(1, 3, 5, 7))
-                print(lk_qs)
+                print('lk_qs:', lk_qs)
             elif tmpType == 1:
                 lk_qs = LangKeyModel.objects.filter(type__in=(2, 3, 6, 7))
             elif tmpType == 2:
@@ -237,19 +242,25 @@ 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)
             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')
+            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)
             lang_perm_ls = list(lang_perm_ql)
+            print('lang_perm_ql:', lang_perm_ql)
+            print('lw_dict:', lw_dict)
             for lv in lv_qs:
                 lang = lv['la__lang']
                 # print('lang=%s' % lang)
                 lw_dict[lv['lk__word_key']][lang] = lv['word_val']
+                # print('lw_dict_word_val:', lw_dict)
                 if user.role_type == 1:
                     lw_dict[lv['lk__word_key']]['status'] = 0
                 elif lang in lang_perm_ls:
                     lw_dict[lv['lk__word_key']]['status'] = lv['status']
+                # print('lw_dict_status:', lw_dict)
             res = {
                 'la_list': list(la_qs),
                 'lw_dict': lw_dict,
@@ -257,6 +268,7 @@ class LangWordView(TemplateView):
                 # 'lv_list': list(lv_qs)
                 'count': count
             }
+            print('res:',res)
             return response.json(0, res)
         else:
             return response.json(444, 'page,line')
@@ -270,11 +282,12 @@ class LangWordView(TemplateView):
             # 获取该用户可以修改的语种
             lp_qs = LangPermModel.objects.filter(user_id=userID).values_list('lang__id')
             lq_list = list(lp_qs)
+            print('lq_list:', lq_list)
             # ls_qs = LangSetModel.objects.filter(user_id=userID, lang_id__in=lq_list).values_list('lang__id')
             # ls_list = list(ls_qs)
             lk = LangKeyModel.objects.filter(word_key__in=word_key_list).values_list('id')
             lv_qs = LangValModel.objects.filter(Q(lk_id__in=lk) & ~Q(status=0) & Q(la_id__in=lq_list))
-            print(lv_qs.values())
+            # print(lv_qs.values())
             if lv_qs.exists():
                 lv_qs.update(status=0)
                 return response.json(0)