diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index e924278ea..f44b2ab90 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -388,7 +388,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { String key = entry.getKey(); String value = (String) entry.getValue(); if(StringUtils.isNotBlank(value)){ - if("technology_territory".equals(key) && ObjectUtils.isNotEmpty(value)){ + if(("technology_territory".equals(key) || "standard_system".equals(key)) && ObjectUtils.isNotEmpty(value)){ JSONArray should = new JSONArray(); List> mapList = new ArrayList<>(); @@ -401,31 +401,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { } JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, should); must.add(jsonObject); - }else if("standard_system".equals(key) && ObjectUtils.isNotEmpty(value)){ - JSONArray should = new JSONArray(); - - for (String s : value.split(",")) { - Map map = new HashMap(); - map.put("query",s); - Map map1 = new HashMap<>(); - map1.put(key,map); - Map map2 = new HashMap<>(); - map2.put("match",map1); - should.add(map2); - } - - -// for (String s : value.split(",")) { -// Map map = new HashMap(); -// map.put(key,"*"+s+"*"); -// Map map1 = new HashMap<>(); -// map1.put("wildcard",map); -// should.add(map1); -// } - - JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, should); - must.add(jsonObject); - }else{ + } else{ Map map = new HashMap<>(); Map queryMap = new HashMap<>(); Map queryMapTemp = new HashMap<>();