fix(jg)：纳管率气瓶查询错误

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java

@@ -954,20 +954,33 @@ public class ZLDPStatisticsServiceImpl {
             boolMust.must(query);
         }
 
-        if (!ObjectUtils.isEmpty(paramDto.getTreeValue())) {
-            BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-            String test = QueryParser.escape(paramDto.getTreeValue());
-            meBuilder.must(QueryBuilders.matchPhraseQuery("EQU_LIST_CODE", test));
-            boolMust.must(meBuilder);
+        if ("2300".equals(paramDto.getTreeValue())) {
+            if (!"".equals(paramDto.getEquCategoryCode())) {
+                // treeValue 为 "2300" 且 equCategoryCode 非空时
+                BoolQueryBuilder query = QueryBuilders.boolQuery();
+                String escapedValue = QueryParser.escape(paramDto.getEquCategoryCode());
+                query.must(QueryBuilders.matchPhraseQuery("EQU_DEFINE_CODE", escapedValue));
+                boolMust.must(query);
+            } else {
+                // treeValue 为 "2300" 且 equCategoryCode 为空时
+                BoolQueryBuilder query = QueryBuilders.boolQuery();
+                String escapedValue = QueryParser.escape(paramDto.getTreeValue());
+                query.must(QueryBuilders.matchPhraseQuery("EQU_CATEGORY_CODE", escapedValue));
+                boolMust.must(query);
             }
+        } else {
+            // treeValue 不为 "2300" 时
+            BoolQueryBuilder query = QueryBuilders.boolQuery();
+            String escapedValue = QueryParser.escape(paramDto.getTreeValue());
+            query.must(QueryBuilders.matchPhraseQuery("EQU_LIST_CODE", escapedValue));
 
-        if (!ObjectUtils.isEmpty(paramDto.getEquCategoryCode())) {
-            BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-            String test = QueryParser.escape(paramDto.getEquCategoryCode());
-            meBuilder.must(QueryBuilders.matchPhraseQuery("EQU_CATEGORY_CODE", test));
-            boolMust.must(meBuilder);
+            // 处理 equCategoryCode 为空的情况
+            if (!"".equals(paramDto.getEquCategoryCode())) {
+                escapedValue = QueryParser.escape(paramDto.getEquCategoryCode());
+                query.must(QueryBuilders.matchPhraseQuery("EQU_CATEGORY_CODE", escapedValue));
+            }
+            boolMust.must(query);
         }
-
         BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
         String param = QueryParser.escape("true");
         pBuilder.must(QueryBuilders.matchQuery(IS_INTO_MANAGEMENT, param));