Commit 0bf974bd authored by l fc's avatar l fc
Browse files

fix(es):修复高级检索code值问题

No related merge requests found
Showing with 5 additions and 2 deletions
+5 -2
......@@ -435,7 +435,7 @@ public class MvServerStandardMapper {
// 处理全文搜索条件
if (mvServerStandardEntity.isFullText()) {
boolQueryBuilder.must(QueryBuilders.matchQuery("a330", mvServerStandardEntity.getStandardInfo()));
boolQueryBuilder.must(QueryBuilders.matchQuery("a298", mvServerStandardEntity.getStandardInfo()));
}
// 处理日期范围查询
......@@ -509,6 +509,7 @@ public class MvServerStandardMapper {
shouldQuery.should(QueryBuilders.termQuery("icsn3", code));
}
boolQueryBuilder.must(shouldQuery);
boolQueryBuilder.mustNot(QueryBuilders.termQuery("domain", "D_NATIVE"));
}
//层级检索
if (StringUtils.isNotBlank(mvServerStandardEntity.getLevelCode())) {
......@@ -521,8 +522,10 @@ public class MvServerStandardMapper {
shouldQuery.should(QueryBuilders.termQuery("a104", code));
}
boolQueryBuilder.must(shouldQuery);
// 添加排除条件:domain"D_FOREIGN"
boolQueryBuilder.mustNot(QueryBuilders.termQuery("domain", "D_FOREIGN"));
}
if (StringUtils.isNotBlank(mvServerStandardEntity.getSubtypedes())&& mvServerStandardEntity.getSubtypedes().equals("0")){
if (StringUtils.isNotBlank(mvServerStandardEntity.getSubtypedes())&& mvServerStandardEntity.getSubtypedes().equals("0")){
boolQueryBuilder.must(QueryBuilders.termQuery("subtypedes", "国家标准"));
boolQueryBuilder.must(QueryBuilders.termQuery("issuer", "GB"));
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment