mirror of
https://github.com/dataease/dataease.git
synced 2026-05-14 04:12:11 +08:00
fix:【系统变量】自定义SQL使用系统内置手机号变量数据筛选失败
This commit is contained in:
@@ -120,7 +120,7 @@ public class DeSqlparserUtils {
|
||||
} else {
|
||||
value = handleSubstitutedSql(sysVariableId);
|
||||
}
|
||||
if (value != null) {
|
||||
if (StringUtils.isNotEmpty(value)) {
|
||||
sqlItem = sqlItem.replace(SysParamsSubstitutedParams + sysVariableId, value);
|
||||
replaceParamItem = true;
|
||||
}
|
||||
@@ -241,6 +241,9 @@ public class DeSqlparserUtils {
|
||||
if (sysVariableId.equalsIgnoreCase("sysParams.userName")) {
|
||||
return userEntity.getName();
|
||||
}
|
||||
if (sysVariableId.equalsIgnoreCase("sysParams.userPhone")) {
|
||||
return userEntity.getPhone();
|
||||
}
|
||||
for (SysVariableValueItem variable : userEntity.getVariables()) {
|
||||
if (!variable.isValid()) {
|
||||
continue;
|
||||
|
||||
2
de-xpack
2
de-xpack
Submodule de-xpack updated: b49722caa4...594973968d
@@ -9,4 +9,5 @@ public class Item {
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long id;
|
||||
private String name;
|
||||
private String account;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user