From a13255b4129ee8a7a7b7e1ecd8e02dd2c78f7c17 Mon Sep 17 00:00:00 2001 From: 田源 <tianyuan@vci-tech.com> Date: 星期四, 16 一月 2025 16:19:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIEngineServiceI.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIEngineServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIEngineServiceI.java index bbc26c9..f56b887 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIEngineServiceI.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIEngineServiceI.java @@ -1,10 +1,10 @@ package com.vci.web.service; import com.vci.corba.common.PLException; +import com.vci.corba.portal.data.PLAction; import com.vci.corba.portal.data.PLTabButton; import com.vci.corba.portal.data.PLUILayout; import com.vci.corba.portal.data.PortalVI; -import com.vci.corba.portal.data.PLAction; import com.vci.pagemodel.*; import java.util.Collection; @@ -177,7 +177,7 @@ * @param pkComponent 缁勪欢鐨勪富閿� * @return 鎸夐挳鐨勪俊鎭� */ - List<UIButtonDefineVO> listButtonByComponent(String pkComponent); + List<UIButtonDefineVO> listButtonByComponent(String pkComponent, Map<String, List<RoleRightVO>> roleRightMap); /** * 鎸夐挳鐨勬暟鎹璞¤浆鎹负鏄剧ず瀵硅薄 @@ -205,9 +205,10 @@ * @param id 涓婚敭 * @return UI涓婁笅鏂囩殑淇℃伅 */ - UIContentVO getUIContentByBtmTypeAndId(String btmType, String id); + UIContentVO getUIContentByBtmTypeAndId(String btmType, String id) throws PLException; -// UIContentVO UIContentDO2VO(PLPageLayoutDefination pageLayoutDefination, boolean queryDetail); - UIContentVO UIContentDO2VO(PLUILayout pageLayoutDefination, boolean queryDetail); + // UIContentVO UIContentDO2VO(PLPageLayoutDefination pageLayoutDefination, boolean queryDetail); + + UIContentVO UIContentDO2VO(PLUILayout pageLayoutDefination, boolean queryDetail,Map<String, List<RoleRightVO>> roleRightMap); } -- Gitblit v1.9.3