Browse Source

Merge pull request #15391 in DESIGN/design from feature/x to bugfix/11.0

* commit 'aee3857b8a9aed8860d16f3aeee9cf46caf9f6b9':
  REPORT-135434 添加角色id参数
bugfix/11.0
superman 2 months ago
parent
commit
31fbdbdd3a
  1. 1
      designer-base/src/main/java/com/fr/design/formula/FormulaConstants.java
  2. 1
      designer-base/src/main/java/com/fr/design/formula/VariableResolverAdapter.java

1
designer-base/src/main/java/com/fr/design/formula/FormulaConstants.java

@ -13,6 +13,7 @@ public enum FormulaConstants {
TOTAL_PAGE_NUMBER("$$totalPage_number", "Total_Page_Number"),
FINE_USERNAME("$fine_username", "Fine_Username"),
FINE_ROLE("$fine_role", "Fine_Role"),
FINE_ROLE_ID("$fine_role_id", "Fine_Role_Id"),
FINE_POSITION("$fine_position", "Fine_Position"),
NULL("NULL", "Null"),
NOFILTER("NOFILTER", "No_Filter"),

1
designer-base/src/main/java/com/fr/design/formula/VariableResolverAdapter.java

@ -31,6 +31,7 @@ public abstract class VariableResolverAdapter implements VariableResolver {
// 下面是权限相关的参数
ScriptConstants.DETAIL_TAG + ParameterConstants.FINE_USERNAME,
ScriptConstants.DETAIL_TAG + ParameterConstants.FINE_ROLE,
ScriptConstants.DETAIL_TAG + ParameterConstants.FINE_ROLE_ID,
ScriptConstants.DETAIL_TAG + ParameterConstants.FINE_POSITION,
// 空值参数
"NULL", "NOFILTER",

Loading…
Cancel
Save