|
@@ -11,6 +11,7 @@ import com.jfireel.expression.node.impl.VariableNode;
|
|
import com.jfireel.expression.token.Token;
|
|
import com.jfireel.expression.token.Token;
|
|
import org.apache.commons.collections4.MapUtils;
|
|
import org.apache.commons.collections4.MapUtils;
|
|
import org.springblade.core.tool.utils.*;
|
|
import org.springblade.core.tool.utils.*;
|
|
|
|
+import org.springblade.manager.dto.ParamElements;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
import java.text.ParseException;
|
|
import java.text.ParseException;
|
|
@@ -1448,7 +1449,7 @@ public class CustomFunction {
|
|
}
|
|
}
|
|
|
|
|
|
public static Object tree(List<String> treeNodes, String param) {
|
|
public static Object tree(List<String> treeNodes, String param) {
|
|
- if (CollectionUtil.isNotEmpty(treeNodes) && Func.isNotBlank(param)) {
|
|
|
|
|
|
+ if (CollectionUtil.isNotEmpty(treeNodes) && Func.isNotBlank(param)&&RegexUtil.match(ParamElements.LEVEL_REG, param.trim())) {
|
|
List<String> nodes = new ArrayList<>(treeNodes);
|
|
List<String> nodes = new ArrayList<>(treeNodes);
|
|
//Collections.reverse(nodes);
|
|
//Collections.reverse(nodes);
|
|
List<String> result = new ArrayList<>();
|
|
List<String> result = new ArrayList<>();
|
|
@@ -1462,7 +1463,7 @@ public class CustomFunction {
|
|
}
|
|
}
|
|
return String.join("", result);
|
|
return String.join("", result);
|
|
}
|
|
}
|
|
- return "";
|
|
|
|
|
|
+ return param;
|
|
}
|
|
}
|
|
|
|
|
|
public static Object tableNames(List<String> treeNodes) {
|
|
public static Object tableNames(List<String> treeNodes) {
|