Commit 32574599 authored by tianyiming's avatar tianyiming

fix: 调整单位类型判断逻辑以避免特定字符串的误匹配

parent a4ab1642
...@@ -501,7 +501,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl { ...@@ -501,7 +501,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
if (!ObjectUtils.isEmpty(filter.get("filterParams"))) { if (!ObjectUtils.isEmpty(filter.get("filterParams"))) {
filterParams = JSONObject.parseObject(JSONObject.toJSONString(filter.get("filterParams"))); filterParams = JSONObject.parseObject(JSONObject.toJSONString(filter.get("filterParams")));
String filterType = filter.getString("filterType"); String filterType = filter.getString("filterType");
if(filterParams.containsKey("unitType") && !filterParams.getString("unitType").equals("all")){ if (filterParams.containsKey("unitType") && !filterParams.getString("unitType").contains("all") && !filterParams.getString("unitType").contains("[]")) {
filterParams.remove("unitCategory"); filterParams.remove("unitCategory");
} }
//快捷筛选和自定义筛选解析筛选规则不一致 //快捷筛选和自定义筛选解析筛选规则不一致
......
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