修改尼斯大类匹配失败及名称重复的问题

specialname/dao/tm_treasure_name_es.py

@@ -37,10 +37,14 @@ class NameEs:
                             "wildcard": {
                                 "tm_name": include_word_type
                             }
+                        },
+                        {
+                            "terms": {
+                                "ncl_one": ncl_one_list
+                            }
                         }
-                    ],
 
-                    "should":[]
+                    ],
                 }
             },
             "sort": {
@@ -52,10 +56,5 @@ class NameEs:
             }
         }
 
-        for ncl_one in ncl_one_list:
-            query['query']['bool']['should'].append({
-                "match_phrase": {
-                    "ncl_one":ncl_one
-                }
-            })
+
         return self.esBase.select(index=index,body=query)

specialname/service/tm_treasure_name.py

@@ -52,7 +52,7 @@ def name_treasure(result_json):
             else:
                 name_result_list.append(item['tm_name'])
 
-
-    return name_result_list
+    result_list = list(set(name_result_list))
+    return result_list