Merge branch 'mr/beta/dbmw' into 'master'

show_by_index

See merge request !33

data_sync/answer/transfer.py

@@ -236,7 +236,7 @@ def get_answers(pks):
             if 3315 in item['operators_add_tags']:
                 item['new_smr'] = answer.get_answer_newuser_smr(answer_id=answer.id)
 
-            tractate_all_tag_names = []
+            answer_all_tag_names = list()
             filter_tags_names = ["假体隆胸", "自体脂肪隆胸", "胶原蛋白填充隆胸", "玻尿酸填充隆胸", "胸部假体取出",
                                  "胸部失败修复", "胸部下垂矫正", "胸部修复", "胸形美化", "丰胸(隆胸)", "胸部塑身", "玻尿酸隆胸", "假体隆胸", "胶原蛋白隆胸",
                                  "埋线隆胸", "自体脂肪隆胸", "胸部注射物取出", "胸部假体取出", "胸部假体取出", "胸部修复", "脂肪胶隆胸", "胸部整形", "隆胸", "胸部美化",
@@ -244,14 +244,13 @@ def get_answers(pks):
                                  "胸部修复", "胸部手术", "胸部提升", "生胸毛", "美胸", "胸毛", "胸部", "胸形", "胸部假体", "胸部kyc"]
             operators_add_tags_names = list()
             operators_add_tags_names = get_tag_v3_names_by_tag_v3_ids(item['operators_add_tags'])
-            tractate_all_tag_names.extend(
-                item["tractate_tag_name"] + + item["tags_v3"] + item["first_demands"] + item["second_demands"] + item[
-                    "first_solutions"] + item[
-                    "second_solutions"] + item["positions"] + item["second_positions"]
-                + item['tag_name'] + item['fresh_tag_name'] + item["operators_add_tags"] + item["anecdote_tags"] + item[
-                    "portrait_tag_name"] + item['gossip_tags'] + operators_add_tags_names)
-
-            tags_inter = list(set(tractate_all_tag_names).intersection(set(filter_tags_names)))
+            answer_all_tag_names.extend(item["tags_v3"] + item["first_demands"] + item["second_demands"] + item[
+                "first_solutions"] + item["second_solutions"] + item["positions"] + item["second_positions"] + item[
+                                              'tag_name'] + item['fresh_tag_name'] + item["operators_add_tags"] + item[
+                                              "anecdote_tags"] + item["portrait_tag_name"] + item[
+                                              'gossip_tags'] + operators_add_tags_names)
+
+            tags_inter = [item for item in list(set(answer_all_tag_names)) if item in list(set(filter_tags_names))]
             if tags_inter:
                 item['show_by_index'] = 2  # 2 标签中含有过滤列表中的标签
             else: