修改bug

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/ComprehensiveStatisticalAnalysisServiceImpl.java

@@ -413,11 +413,14 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                     String officeRegion = commonMapper.getCompanyCodeByOrgCode(orgCode);
                     BoolQueryBuilder queryBuilder1 = QueryBuilders.boolQuery();
                     BoolQueryBuilder queryBuilder2 = QueryBuilders.boolQuery();
+                    EnhancedDynamicQueryBuilder enhancedDynamicQueryBuilder = new EnhancedDynamicQueryBuilder();
                     queryBuilder1.must(QueryBuilders.termQuery("superviseOrgCode", "50"))
                             .must(QueryBuilders.wildcardQuery("officeRegion", "*" + officeRegion + "*"));
                     queryBuilder2.mustNot(QueryBuilders.termQuery("superviseOrgCode", "50"))
                             .must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
-                    boolMust.should(queryBuilder1).should(queryBuilder2).minimumShouldMatch(1);
+                    enhancedDynamicQueryBuilder.add(queryBuilder1, or);
+                    enhancedDynamicQueryBuilder.add(queryBuilder2, or);
+                    boolMust.must(enhancedDynamicQueryBuilder.build());
                 } else {
                     boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
                 }