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 23858d31..8771af87 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 @@ -337,10 +337,6 @@ 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.getLawsSyqy())) { boolQueryBuilder.must(QueryBuilders.wildcardQuery("lawsSyqy.keyword", "*"+searchInfoEO.getLawsSyqy()+"*")); } @@ -355,6 +351,15 @@ public class SearchCenterServiceImpl implements SearchCenterService { } boolQueryBuilder.must(boolQueryShould); } + if ("现行有效".equals(searchInfoEO.getTextStatus())) { + if (StringUtils.isNotBlank(searchInfoEO.getStandType())) { + if ("INLAND".equals(searchInfoEO.getStandType()) || "FOREIGN".equals(searchInfoEO.getStandType())) { + boolQueryBuilder.must(QueryBuilders.matchQuery("textStatusName", "现行有效")); + }else if ("bussstand".equals(searchInfoEO.getStandType())) { + boolQueryBuilder.must(QueryBuilders.matchQuery("textStatusBussName", "有效")); + } + } + } searchRequestBuilder.setQuery(boolQueryBuilder).setTrackTotalHits(true); // 获取查询到的结果