From d56aa5f0b6987bc827e7885a15b54310ee28bc4e Mon Sep 17 00:00:00 2001
From: Ldc <ldc@vci.com>
Date: 星期三, 10 四月 2024 11:36:54 +0800
Subject: [PATCH] 1、菜单将b/s配置不为空的都传回去。
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
index eeb450e..7b28e76 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
@@ -260,16 +260,17 @@
MenuVO functionVO = new MenuVO();
functionVO.setId(menu.id);
functionVO.setSource(menu.image);
- if(StringUtils.isBlank(menu.resourceB) || !(menu.resourceB.length()>2 && "bs=".equals(menu.resourceB.substring(0,3)))){
+ if(StringUtils.isBlank(menu.resourceB)){
continue;
}
- if(menu.resourceB.contains("type=") || menu.resourceB.contains("context=")){
- String[] split = menu.resourceB.split("\\?")[0].split("=");
- functionVO.setPath((split.length>1 && split[1].equals("test") ? "/custom-ui/" :"/base/UIContentViewer") + menu.resourceB.substring(3));
- }else{
- functionVO.setPath("/views/" + menu.id);
-// functionVO.setPath("/" + menu.resourceB + menu.aliasName);
- }
+ functionVO.setPath(menu.resourceB);
+// if(menu.resourceB.contains("type=") || menu.resourceB.contains("context=")){
+// String[] split = menu.resourceB.split("\\?")[0].split("=");
+// functionVO.setPath((split.length>1 && split[1].equals("test") ? "/custom-ui/" :"/base/UIContentViewer") + menu.resourceB.substring(3));
+// }else{
+// functionVO.setPath("/views/" + menu.id);
+//// functionVO.setPath("/" + menu.resourceB + menu.aliasName);
+// }
functionVO.setParentId(menu.parentId);
functionVO.setCode(menu.aliasName);
functionVO.setAlias(menu.aliasName);
@@ -298,16 +299,17 @@
MenuVO functionVO = new MenuVO();
functionVO.setId(menu.id);
functionVO.setSource(menu.image);
- if(StringUtils.isBlank(menu.resourceB) || !(menu.resourceB.length()>2 && "bs=".equals(menu.resourceB.substring(0,3)))){
+ if(StringUtils.isBlank(menu.resourceB) ){
continue;
}
- if(menu.resourceB.contains("type=") || menu.resourceB.contains("context=")){
- String[] split = menu.resourceB.split("\\?")[0].split("=");
- functionVO.setPath((split.length>1 && split[1].equals("test") ? "/custom-ui/" :"/base/UIContentViewer") + menu.resourceB.substring(3));
- }else{
- functionVO.setPath("/views/" + menu.id);
-// functionVO.setPath("/" + menu.resourceB + menu.aliasName);
- }
+ functionVO.setPath(menu.resourceB);
+// if(menu.resourceB.contains("type=") || menu.resourceB.contains("context=")){
+// String[] split = menu.resourceB.split("\\?")[0].split("=");
+// functionVO.setPath((split.length>1 && split[1].equals("test") ? "/custom-ui/" :"/base/UIContentViewer") + menu.resourceB.substring(3));
+// }else{
+// functionVO.setPath("/views/" + menu.id);
+//// functionVO.setPath("/" + menu.resourceB + menu.aliasName);
+// }
functionVO.setCode(menu.aliasName);
functionVO.setAlias(menu.aliasName);
functionVO.setParentId(menu.parentId);
@@ -335,13 +337,9 @@
if(resourceControlTypeEnum == null){
resourceControlTypeEnum = ResourceControlTypeEnum.BS;
}
-// PortalServicePrx uiService = ServiceProvider.getUIService();
-// FrameworkServicePrx frameService = ServiceProvider.getFrameService();
-// FunctionInfo[] menus = ServiceProvider.getFrameService().getModuleListByParentId("modelManagmentNode", true);
for (PLUILayout allPLUILayout : ServiceProvider.getUIService().getAllPLUILayouts()) {
- if("folder".equals(allPLUILayout.plRelatedType) && "cardtemplatemanager".equals(allPLUILayout.plCode)){
-// if("workflowinstance".equals(allPLUILayout.plRelatedType)){
-// System.out.printf("");
+ if(treeQueryObject.getConditionMap().getOrDefault("type","").equals(allPLUILayout.plRelatedType)
+ && treeQueryObject.getConditionMap().getOrDefault("context","").equals(allPLUILayout.plCode)){
return uiEngineServiceI.UIContentDO2VO(allPLUILayout,true);
}
}
--
Gitblit v1.9.3