diff --git a/core/core-backend/src/main/java/io/dataease/commons/utils/DeSqlparserUtils.java b/core/core-backend/src/main/java/io/dataease/commons/utils/DeSqlparserUtils.java index ee91b8bf65..7d220b1811 100644 --- a/core/core-backend/src/main/java/io/dataease/commons/utils/DeSqlparserUtils.java +++ b/core/core-backend/src/main/java/io/dataease/commons/utils/DeSqlparserUtils.java @@ -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; diff --git a/de-xpack b/de-xpack index b49722caa4..594973968d 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit b49722caa48820b920a07fc685406a7ba2646643 +Subproject commit 594973968db99c254b4fc47fb4096b7b8c4a40db diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/Item.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/Item.java index b1e5f84bb4..283e0559f9 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/Item.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/Item.java @@ -9,4 +9,5 @@ public class Item { @JsonSerialize(using = ToStringSerializer.class) private Long id; private String name; + private String account; }