fix: industry

--bug=1063849 --user=王旭 【客户/线索/商机】高级筛选-行业字段-筛选条件错误-筛选报错 https://www.tapd.cn/34675357/s/1803330

Author: WangXu10

backend/crm/src/main/java/cn/cordys/common/utils/ConditionFilterUtils.java

@@ -28,8 +28,12 @@
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
+
+import static cn.cordys.common.utils.IndustryUtils.getIndustries;
 
 /**
  * @Author: jianxing
@@ -152,6 +156,20 @@ private static void parseCondition(CombineSearch combineSearch) {
                 List<String> attachmentIds = Objects.requireNonNull(attachmentMapper).getAttachmentIdsByNames(attachmentNames);
                 item.setValue(CollectionUtils.isEmpty(attachmentIds) ? attachmentNames : attachmentIds);
             }
+
+
+            if (item.getValue() != null && Strings.CS.equals(item.getType(), FieldType.INDUSTRY.name())) {
+                String str = item.getValue().toString()
+                        .replace("[", "")
+                        .replace("]", "");
+
+                List<String> list = Arrays.stream(str.split(","))
+                        .map(String::trim)
+                        .collect(Collectors.toList());
+                List<String> values = IndustryUtils.getValues(getIndustries(), list);
+                values.addAll(list);
+                item.setValue(values.stream().distinct().toList());
+            }
         });
         replaceCurrentUser(validConditions);
     }

backend/crm/src/main/java/cn/cordys/common/utils/IndustryUtils.java

@@ -10,10 +10,7 @@
 
 import java.io.InputStream;
 import java.lang.ref.SoftReference;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
+import java.util.*;
 
 /**
  * @author song-cc-rock
@@ -108,4 +105,49 @@ private static boolean findRecursive(List<IndustryDict> industryTree, Queue<Stri
         }
         return false;
     }
+
+
+    public static List<String> getValues(List<IndustryDict> tree, List<String> targetValues) {
+        List<String> result = new ArrayList<>();
+
+        for (String target : targetValues) {
+            List<String> values = getValuesForSingle(tree, target);
+            if (values != null) {
+                result.addAll(values);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 查找单个 value，并返回其所有子节点 value
+     */
+    private static List<String> getValuesForSingle(List<IndustryDict> tree, String targetValue) {
+        for (IndustryDict node : tree) {
+            if (node.getValue().equals(targetValue)) {
+                List<String> result = new ArrayList<>();
+                collectValues(node, result);
+                return result;
+            }
+
+            if (node.getChildren() != null) {
+                List<String> res = getValuesForSingle(node.getChildren(), targetValue);
+                if (res != null) return res;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 收集节点自身和所有子节点的 value
+     */
+    private static void collectValues(IndustryDict node, List<String> result) {
+        result.add(node.getValue());
+
+        if (node.getChildren() != null) {
+            for (IndustryDict child : node.getChildren()) {
+                collectValues(child, result);
+            }
+        }
+    }
 }