From 9717a73e1a5d257cb1369362406769a81650078d Mon Sep 17 00:00:00 2001 From: "shengzu.xue" Date: Fri, 1 Nov 2024 14:40:22 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-135434=20=E6=B7=BB=E5=8A=A0=E8=A7=92?= =?UTF-8?q?=E8=89=B2id=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/formula/FormulaConstants.java | 1 + .../main/java/com/fr/design/formula/VariableResolverAdapter.java | 1 + 2 files changed, 2 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/formula/FormulaConstants.java b/designer-base/src/main/java/com/fr/design/formula/FormulaConstants.java index 4dfcb4bb47..a020924816 100644 --- a/designer-base/src/main/java/com/fr/design/formula/FormulaConstants.java +++ b/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"), diff --git a/designer-base/src/main/java/com/fr/design/formula/VariableResolverAdapter.java b/designer-base/src/main/java/com/fr/design/formula/VariableResolverAdapter.java index 5fd384be8e..13e69d7f4b 100644 --- a/designer-base/src/main/java/com/fr/design/formula/VariableResolverAdapter.java +++ b/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",