From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
index 5b7405f..87d55b9 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
@@ -297,6 +297,7 @@
menuVO.setHasChildren(false);
menuVO.setCategory(1);
menuVO.setFunctionType(2);
+ menuVO.setSource(info.image);
buttonList.add(menuVO);
}
}
@@ -488,6 +489,7 @@
menuVO.setHasChildren(false);
menuVO.setCategory(1);
menuVO.setFunctionType(3);
+ menuVO.setSource(info.image);
menuVOList.add(menuVO);
}
}
@@ -607,6 +609,7 @@
menuVO.setName(funcInfo.name);
menuVO.getMeta().put("keepAlive",true);
menuVO.setSort((int) funcInfo.seq);
+ menuVO.setRemark(funcInfo.desc);
if(this.checkChildObject(menuVO.getId()) == 0){
menuVO.setHasChildren(false);
}else{
@@ -655,6 +658,7 @@
functionVO.setName(menu.name);
functionVO.getMeta().put("keepAlive",true);
functionVO.setSort((int) menu.seq);
+ functionVO.setRemark(menu.desc);
functionVO.setChildren(findChildFunctionVO(menu.id,map));
if(functionVO.getChildren().size() > 0){
functionVO.setHasChildren(true);
@@ -683,6 +687,7 @@
menuVO.setName(funcObj.name);
menuVO.getMeta().put("keepAlive",true);
menuVO.setSort((int) funcObj.seq);
+ menuVO.setRemark(funcObj.desc);
findChildAuthFunctionVO(menuVO, isAll);
functionVO.getChildren().add(menuVO);
functionVO.setHasChildren(true);
@@ -717,7 +722,7 @@
/* if(resourceControlTypeEnum == null){
resourceControlTypeEnum = ResourceControlTypeEnum.BS;
}*/
- Map<String, RoleRightVO> roleRightMap = uiManagerServiceI.getRoleRightMap(null);
+ Map<String, List<RoleRightVO>> roleRightMap = uiManagerServiceI.getRoleRightMap(null);
for (PLUILayout allPLUILayout : platformClientUtil.getUIService().getAllPLUILayouts()) {
if(treeQueryObject.getConditionMap().getOrDefault("type","").equals(allPLUILayout.plRelatedType)
&& treeQueryObject.getConditionMap().getOrDefault("context","").equals(allPLUILayout.plCode)){
--
Gitblit v1.9.3