public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-14 04:12:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix:【系统变量】自定义SQL使用系统内置手机号变量数据筛选失败

Browse Source
This commit is contained in:
taojinlong
2026-04-15 21:54:11 +08:00
committed by xuwei-fit2cloud
parent 0a96e60a65
commit e1085ffb75
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/commons/utils/DeSqlparserUtils.java
View File

@@ -181,7 +181,7 @@ public class DeSqlparserUtils {
}
private static boolean isParams(String paramId) {
if (Arrays.asList("sysParams.userId", "sysParams.userEmail", "sysParams.userName").contains(paramId)) {
if (Arrays.asList("sysParams.userId", "sysParams.userEmail", "sysParams.userName", "sysParams.userPhone").contains(paramId)) {
return true;
}
boolean isLong = false;

5
core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java
View File

@@ -150,7 +150,7 @@ public class SqlparserUtils {
}
private static boolean isParams(String paramId) {
if (Arrays.asList("sysParams.userId", "sysParams.userEmail", "sysParams.userName").contains(paramId)) {
if (Arrays.asList("sysParams.userId", "sysParams.userEmail", "sysParams.userName", "sysParams.userPhone").contains(paramId)) {
return true;
}
boolean isLong = false;
@@ -726,6 +726,9 @@ public class SqlparserUtils {
sql = sql.replace(SysParamsSubstitutedParams + "sysParams.userId", userEntity.getAccount());
sql = sql.replace(SysParamsSubstitutedParams + "sysParams.userEmail", userEntity.getEmail());
sql = sql.replace(SysParamsSubstitutedParams + "sysParams.userName", Translator.get(userEntity.getName()));
if (StringUtils.isNotEmpty(userEntity.getPhone())) {
sql = sql.replace(SysParamsSubstitutedParams + "sysParams.userPhone", Translator.get(userEntity.getPhone()));
}
for (SysVariableValueItem variable : userEntity.getVariables()) {
String value = null;
if (!variable.isValid()) {