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 9adcd241..457c91eb 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 @@ -1333,7 +1333,19 @@ public class SearchCenterServiceImpl implements SearchCenterService { QueryBuilder multiQueryBuilder1; QueryBuilder queryBuilder1 = QueryBuilders.multiMatchQuery(""); if(StringUtils.isNotBlank(searchInfoEO.getSelectValue())){ - queryBuilder1 = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), + if(searchInfoEO.getSelectValue().length() > 1){ + String str0 = searchInfoEO.getSelectValue().substring(0,1); + String Str1 = searchInfoEO.getSelectValue().substring(1,2); + String reg = ".*[0-9].*"; + Pattern pattern = Pattern.compile("^[a-zA-Z\\/]+$"); + if (pattern.matcher(str0).matches() && Str1.matches(reg)) { + String value = searchInfoEO.getSelectValue().replace(str0,str0+" "); + searchInfoEO.setSelectValue(value); + } + } + + + queryBuilder1 = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue().toUpperCase(), "title" ).minimumShouldMatch("100%").field("title",1000f); boolQueryBuilder.must(queryBuilder1); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 32e0808e..6896763d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -1222,7 +1222,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl