be

getrebuild · Feb 15, 2025 · f7c1f28 · f7c1f28
1 parent 1a92673
commit f7c1f28
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/com/rebuild/core/service/query/ParseHelper.java b/src/main/java/com/rebuild/core/service/query/ParseHelper.java
@@ -20,6 +20,7 @@
 import com.rebuild.core.metadata.easymeta.EasyMetaFactory;
 import com.rebuild.core.metadata.impl.EasyEntityConfigProps;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 
 import java.util.HashSet;
@@ -319,6 +320,6 @@ public static boolean validAdvFilter(JSONObject advFilter) {
         if (advFilter == null || advFilter.isEmpty()) return false;
 
         JSONArray items = advFilter.getJSONArray("items");
-        return items != null && !items.isEmpty();
+        return !CollectionUtils.isEmpty(items);
     }
 }
diff --git a/src/main/java/com/rebuild/core/support/general/ProtocolFilterParser.java b/src/main/java/com/rebuild/core/support/general/ProtocolFilterParser.java
@@ -29,6 +29,7 @@
 import com.rebuild.utils.CommonsUtils;
 import com.rebuild.utils.JSONUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.Assert;
 
@@ -129,7 +130,7 @@ protected String parseVia(String viaId, String refField) {
                 // be:v4.0 轴-数值条件也生效
                 JSONObject axis = chartConfig.getJSONObject("axis");
                 JSONArray numsOfAxis = axis == null ? null : axis.getJSONArray("numerical");
-                if (numsOfAxis != null) {
+                if (!CollectionUtils.isEmpty(numsOfAxis)) {
                     List<String> numsSqls = new ArrayList<>();
                     for (Object o : numsOfAxis) {
                         JSONObject axisFilterExp = ((JSONObject) o).getJSONObject("filter");