Merge branch 'develop_tzs_register' of…

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

@@ -1374,13 +1374,15 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             if (!ObjectUtils.isEmpty(leftTechParam) && !ObjectUtils.isEmpty(leftParamRange)) {
                 addTechParam(leftTechParam, leftParamRange, leftBuilder);
             }
-            // 非计数参数处理
-            groupHandler(leftGroupList, leftBuilder);
-            // 添加左侧筛选条件到最终筛选条件中
-            if (isOrGroup) {
-                mainBuilder.or(leftBuilder.build());
-            } else {
-                mainBuilder.and(leftBuilder.build());
+            if(!ObjectUtils.isEmpty(leftGroupList)){
+                // 非计数参数处理
+                groupHandler(leftGroupList, leftBuilder);
+                // 添加左侧筛选条件到最终筛选条件中
+                if (isOrGroup) {
+                    mainBuilder.or(leftBuilder.build());
+                } else {
+                    mainBuilder.and(leftBuilder.build());
+                }
             }
         }
 
@@ -1396,14 +1398,15 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             if (!ObjectUtils.isEmpty(rightTechParam) && !ObjectUtils.isEmpty(rightParamRange)) {
                 addTechParam(rightTechParam, rightParamRange, rightBuilder);
             }
-            // 非计数参数处理
-            groupHandler(rightGroupList, rightBuilder);
-
-            // 添加右侧筛选条件到最终筛选条件中
-            if (isOrGroup) {
-                mainBuilder.or(rightBuilder.build());
-            } else {
-                mainBuilder.and(rightBuilder.build());
+            if(!ObjectUtils.isEmpty(rightGroupList)){
+                // 非计数参数处理
+                groupHandler(rightGroupList, rightBuilder);
+                // 添加右侧筛选条件到最终筛选条件中
+                if (isOrGroup) {
+                    mainBuilder.or(rightBuilder.build());
+                } else {
+                    mainBuilder.and(rightBuilder.build());
+                }
             }
         }
 
@@ -1422,12 +1425,12 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
     }
 
     private void groupHandler(JSONArray group, EnhancedDynamicQueryBuilder builder) {
-        for (Object object : group) {
-            JSONObject itemObj = JSONObject.parseObject(JSONObject.toJSONString(object));
+        for (int i = 0; i < group.size(); i++) {
+            JSONObject itemObj = group.getJSONObject(i);
+            String andOr = i == 0 ? null : itemObj.getString("andOr");
             String field = itemObj.getString("field");
             String itemCondition = itemObj.getString("itemCondition");
             Object value = itemObj.get("value");
-            String andOr = itemObj.getString("andOr");
             // 组装查询条件
             getItemQuery(field, itemCondition, value, andOr, builder);
         }