Merge remote-tracking branch 'origin/master' into prod_test

src/main/java/cn/cslg/pas/service/business/es/EsProductPatentService.java

@@ -186,8 +186,9 @@ public class EsProductPatentService {
         }
         String finalFieldType =fieldType;
         //设置查询索引
+
         builder.index("patent");
-        Query q1 = QueryBuilders.match(t -> t.field("custom_field.field_value").query(id));
+        Query q1 = QueryBuilders.term(t -> t.field("custom_field.stats_value.raw").value(id));
         Query q2 = QueryBuilders.term(t -> t.field("custom_field.field_type").value(finalFieldType));
         Query bool = QueryBuilders.bool(i -> i.must(q1,q2));
         Query query = QueryBuilders.hasChild(n -> n.type("project_customfield").query(bool));