修改ES查询规则

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java

@@ -276,7 +276,7 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
 
         ElasticsearchUtil es=new ElasticsearchUtil<>(client);
         // 先从ES中拿到检索数据
-        List<EquipmentType> searchResults = es.searchEntities("type_pinyin","name",0, 10, req.getTypeName(),EquipmentType.class);
+        List<EquipmentType> searchResults = es.searchEntities("type_pinyin","name",0, 50, req.getTypeName(),EquipmentType.class);
         LambdaQueryWrapper<EquipmentType> wp = this.createWrapper(req);
         // 获取所有组织机构数据
         List<EquipmentType> allTypes = this.list(wp);

jyzb-biz/src/main/java/com/junmp/jyzb/utils/ElasticsearchUtil.java

@@ -35,11 +35,11 @@ public class ElasticsearchUtil<T> {
         builder.size(pageSize);
 
         MatchQueryBuilder matchQueryBuilder = QueryBuilders.matchQuery(index, keyword).operator(Operator.AND);
-        MatchQueryBuilder matchQueryBuilder2 = QueryBuilders.matchQuery(index+".pinyin", keyword).operator(Operator.AND);
+//        MatchQueryBuilder matchQueryBuilder2 = QueryBuilders.matchQuery(index+".pinyin", keyword).operator(Operator.AND);
 
         BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
         boolQueryBuilder.should(matchQueryBuilder);
-        boolQueryBuilder.should(matchQueryBuilder2);
+//        boolQueryBuilder.should(matchQueryBuilder2);
         if (typeName.equals("orgName"))
         {
             builder.postFilter(new TermQueryBuilder("delFlag", 1));