Commit ca437994 authored by tianyiming's avatar tianyiming

refactor: 添加支持OR条件的参数处理逻辑

parent 9efb7698
...@@ -1377,7 +1377,11 @@ public class ComprehensiveStatisticalAnalysisServiceImpl { ...@@ -1377,7 +1377,11 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
// 非计数参数处理 // 非计数参数处理
groupHandler(leftGroupList, leftBuilder); groupHandler(leftGroupList, leftBuilder);
// 添加左侧筛选条件到最终筛选条件中 // 添加左侧筛选条件到最终筛选条件中
mainBuilder.and(leftBuilder.build()); if (isOrGroup) {
mainBuilder.or(leftBuilder.build());
} else {
mainBuilder.and(leftBuilder.build());
}
} }
if (!ObjectUtils.isEmpty(rightGroup)) { if (!ObjectUtils.isEmpty(rightGroup)) {
......
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