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 b4f8acbc..a66660b4 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 @@ -405,9 +405,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryBuilder.must(QueryBuilders.wildcardQuery("standType.keyword", "*"+searchInfoEO.getStandType()+"*")); } } - if (StringUtils.isNotBlank(searchInfoEO.getTextStatus())) { - boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatus.keyword", "*"+searchInfoEO.getTextStatus()+"*")); - } +// if (StringUtils.isNotBlank(searchInfoEO.getTextStatus())) { +// boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatus.keyword", "*"+searchInfoEO.getTextStatus()+"*")); +// } if (StringUtils.isNotBlank(searchInfoEO.getLawsSyqy())) { boolQueryBuilder.must(QueryBuilders.wildcardQuery("lawsSyqy.keyword", "*"+searchInfoEO.getLawsSyqy()+"*")); @@ -435,19 +435,19 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryBuilder.must(QueryBuilders.wildcardQuery("standType.keyword", "*"+searchInfoEO.getStandType()+"*")); } boolQueryBuilder.must(boolQueryShould); - if (StringUtils.isNotBlank(searchInfoEO.getTextStatus())) { - if (searchInfoEO.getSelectIndex().equals("bussstand")) { - if ("现行有效".equals(searchInfoEO.getTextStatus())) { - boolQueryBuilder.must(QueryBuilders.termQuery("textStatusBuss", "9z741h2m3j")).boost(1009f); - } - } else if (searchInfoEO.getSelectIndex().equals("stand")) { - if ("现行有效".equals(searchInfoEO.getTextStatus())) { - boolQueryBuilder.must(QueryBuilders.termQuery("textStatus", "vsaga7nwub")).boost(1009f); - } + + } + if (StringUtils.isNotBlank(searchInfoEO.getTextStatus())) { + if (searchInfoEO.getSelectIndex().equals("bussstand")) { + if ("现行有效".equals(searchInfoEO.getTextStatus())) { + boolQueryBuilder.must(QueryBuilders.termQuery("textStatusBuss", "9z741h2m3j")).boost(1009f); + } + } else if (searchInfoEO.getSelectIndex().equals("stand")) { + if ("现行有效".equals(searchInfoEO.getTextStatus())) { + boolQueryBuilder.must(QueryBuilders.termQuery("textStatus", "vsaga7nwub")).boost(1009f); } } } - searchRequestBuilder.setQuery(boolQueryBuilder).setTrackTotalHits(true); // 获取查询到的结果