From 06660bcf480201c36bc7538f0de2555b9f2c4bdc Mon Sep 17 00:00:00 2001 From: wxyclub Date: Thu, 30 Nov 2023 18:37:00 +0800 Subject: [PATCH] =?UTF-8?q?bug:=20=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SearchCenterServiceImpl.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) 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); // 获取查询到的结果