Commit 3fbf1aef authored by tianbo's avatar tianbo

fix(elasticsearch): 移除机构代码查询中的多余转义

- 移除了精确查询中对机构代码的 QueryParser.escape 转义处理 - 修复了由于过度转义导致的查询条件匹配问题
parent d081865a
...@@ -269,7 +269,7 @@ public class StCommonServiceImpl { ...@@ -269,7 +269,7 @@ public class StCommonServiceImpl {
BoolQueryBuilder boolMust = QueryBuilders.boolQuery(); BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
if (isOrgBranchCodeExactMatch) { if (isOrgBranchCodeExactMatch) {
// 按照管辖机构区域信息精确查询 // 按照管辖机构区域信息精确查询
boolMust.must(QueryBuilders.termQuery("ORG_BRANCH_CODE", QueryParser.escape(orgCode))); boolMust.must(QueryBuilders.termQuery("ORG_BRANCH_CODE", orgCode));
} else { } else {
// 按照管辖机构区域信息模糊查询 // 按照管辖机构区域信息模糊查询
boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode)); boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
...@@ -307,7 +307,7 @@ public class StCommonServiceImpl { ...@@ -307,7 +307,7 @@ public class StCommonServiceImpl {
BoolQueryBuilder boolMust = QueryBuilders.boolQuery(); BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
if (isOrgBranchCodeExactMatch) { if (isOrgBranchCodeExactMatch) {
// 按照管辖机构区域信息精确查询 // 按照管辖机构区域信息精确查询
boolMust.must(QueryBuilders.termQuery("ORG_BRANCH_CODE", QueryParser.escape(orgCode))); boolMust.must(QueryBuilders.termQuery("ORG_BRANCH_CODE", orgCode));
} else { } else {
// 按照管辖机构区域信息模糊查询 // 按照管辖机构区域信息模糊查询
boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode)); boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
......
Markdown is supported
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