diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index 50ec3e57..34835de1 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -1174,10 +1174,14 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryBuilder.must(multiQuery); } - if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS()) || StringUtils.isNotBlank(searchInfoEO.getCLLX())){ - BoolQueryBuilder boolQueryShould = QueryBuilders.boolQuery(); - boolQueryShould = querySeniorMsg(searchInfoEO,boolQueryShould); - boolQueryBuilder.must(boolQueryShould); + if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS())){ + boolQueryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getNYLXCLASS(), + "textContent" + ).minimumShouldMatch("100%").field("title",10f)); + }else if(StringUtils.isNotBlank(searchInfoEO.getCLLX())){ + boolQueryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getCLLX(), + "textContent" + ).minimumShouldMatch("100%").field("title",10f)); } HighlightBuilder hiBuilder=new HighlightBuilder();