|
@@ -1940,15 +1940,15 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
}
|
|
|
Predicate<String> finalNameTest = nameTest;
|
|
|
elementKeyMap.forEach((k, v)->{
|
|
|
- if(finalNameTest.test(elementName)) {
|
|
|
+ if(finalNameTest.test(k)) {
|
|
|
if(type==0) {
|
|
|
LinkedHashMap<String, Object> element = new LinkedHashMap<>();
|
|
|
fdm.put(k, element);
|
|
|
element.putAll(Arrays.stream(v.split(",")).map(e -> e.split("__"))
|
|
|
.sorted(Comparator.comparingInt(a -> Integer.parseInt(a[1].split("_")[0])))
|
|
|
- .collect(Collectors.groupingBy(a -> a[0], Collectors.mapping(a -> a[1].split("_"), Collectors.toList()))));
|
|
|
+ .collect(Collectors.groupingBy(a -> a[0], Collectors.mapping(a -> a[1], Collectors.toList()))));
|
|
|
}else if(type==1){
|
|
|
- fdm.put(k,Arrays.stream(v.split(",")).map(e -> e.split("__")[0]).collect(Collectors.toList()));
|
|
|
+ fdm.put(k,Arrays.stream(v.split(",")).map(e -> e.split("__")[0]).collect(Collectors.toSet()));
|
|
|
}
|
|
|
}
|
|
|
});
|