Commit 079fe4fb authored by 刘林's avatar 刘林

fix(大屏):一物一赋码折线图报错修改

parent d4617513
...@@ -176,8 +176,9 @@ public class EquipmentStaticsServiceImpl { ...@@ -176,8 +176,9 @@ public class EquipmentStaticsServiceImpl {
request.indices("idx_biz_view_jg_all"); request.indices("idx_biz_view_jg_all");
BoolQueryBuilder boolMust = QueryBuilders.boolQuery(); BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
// 按照管辖机构区域信息模糊查询 // 按照管辖机构区域信息模糊查询
boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(dpFilterParamForDetailDto.getOrgCode()) + "*")); if (StringUtils.isNotEmpty(dpFilterParamForDetailDto.getOrgCode())) {
boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(dpFilterParamForDetailDto.getOrgCode()) + "*"));
}
if (StringUtils.isNotEmpty(dpFilterParamForDetailDto.getTreeValue())) { if (StringUtils.isNotEmpty(dpFilterParamForDetailDto.getTreeValue())) {
if ("2300".equals(dpFilterParamForDetailDto.getTreeValue())){ if ("2300".equals(dpFilterParamForDetailDto.getTreeValue())){
boolMust.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", QueryParser.escape(dpFilterParamForDetailDto.getTreeValue().toLowerCase()))); boolMust.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", QueryParser.escape(dpFilterParamForDetailDto.getTreeValue().toLowerCase())));
......
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