【每个标签之间改为与的关系】

src/main/java/com/zzsn/event/es/EsService.java

@@ -2386,17 +2386,17 @@ public class EsService {
         if (CollectionUtils.isNotEmpty(searchCondition.getSpecialLabelParams())) {
             cn.hutool.json.JSONObject params = searchCondition.getSpecialLabelParams();
             String entityObjectId = params.getStr("entityObjectId");
-            BoolQueryBuilder specialLabelQuery = QueryBuilders.boolQuery();
             if (StrUtil.isNotBlank(entityObjectId) && ("1892197364882550786".equals(entityObjectId) || "1874728877847257089".equals(entityObjectId))){
                 cn.hutool.json.JSONArray jsonArray = params.getJSONArray("labelCodeList");
                 if (ObjectUtil.isNotEmpty(jsonArray) && !jsonArray.isEmpty()){
-                    List<String> reids = new ArrayList<>();
                     jsonArray.forEach(e -> {
                         cn.hutool.json.JSONObject jsonObject = (cn.hutool.json.JSONObject) e;
                         String labelCode = jsonObject.getStr("labelCode");
                         if (StrUtil.isNotBlank(labelCode)){
                             cn.hutool.json.JSONArray jsonArray1 = jsonObject.getJSONArray("children");
                             if (jsonArray1 != null && !jsonArray1.isEmpty()){
+                                List<String> reids = new ArrayList<>();
+
                                 jsonArray1.forEach(f -> {
                                     cn.hutool.json.JSONObject jsonObject1 = (cn.hutool.json.JSONObject) f;
                                     String labelItemCode = jsonObject1.getStr("labelItemCode");
@@ -2404,13 +2404,14 @@ public class EsService {
                                         reids.add(labelCode+"-"+labelItemCode);
                                     }
                                 });
+                                if (CollectionUtils.isNotEmpty(reids)){
+                                    BoolQueryBuilder specialLabelQuery = QueryBuilders.boolQuery();
+                                    specialLabelQuery.must(QueryBuilders.nestedQuery("labels",QueryBuilders.termsQuery("labels.relationId",reids),ScoreMode.None));
+                                    boolQuery.must(specialLabelQuery);
+                                }
                             }
                         }
                     });
-                    if (CollectionUtils.isNotEmpty(reids)){
-                        specialLabelQuery.must(QueryBuilders.nestedQuery("labels",QueryBuilders.termsQuery("labels.relationId",reids),ScoreMode.None));
-                        boolQuery.must(specialLabelQuery);
-                    }
                 }
             }
         }