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/impl/SmFunctionQueryServicePlatformImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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 00490d5..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);
}
}
@@ -415,10 +416,10 @@
//}
functionVO.setPath(menu.resourceB);
functionVO.setParentId(menu.parentId);
- functionVO.setCode(menu.aliasName);
+ //functionVO.setCode(menu.aliasName);
functionVO.setAlias(menu.aliasName);
functionVO.setName(menu.name);
- functionVO.getMeta().put("keepAlive",false);
+ functionVO.getMeta().put("keepAlive",true);
functionVO.setSort((int) menu.seq);
try {
functionVO.setChildren(findChildFunctionVO(menu.id, map));
@@ -488,6 +489,7 @@
menuVO.setHasChildren(false);
menuVO.setCategory(1);
menuVO.setFunctionType(3);
+ menuVO.setSource(info.image);
menuVOList.add(menuVO);
}
}
@@ -571,7 +573,7 @@
menuVO.setFunctionType(2);
menuVO.setChildType(0);
menuVO.setRemark(operateInfo.desc);
- menuVO.getMeta().put("keepAlive",false);
+ menuVO.getMeta().put("keepAlive",true);
menuVO.setSort((int) operateInfo.seq);
menuVO.setModeType("operateObject");
menuVO.setHasChildren(false);
@@ -602,11 +604,12 @@
menuVO.setResourceMobile(funcInfo.resourceMobile);
menuVO.setPath(funcInfo.resourceB);
menuVO.setParentId(funcInfo.parentId);
- menuVO.setCode(funcInfo.aliasName);
+ //menuVO.setCode(funcInfo.aliasName);
menuVO.setAlias(funcInfo.aliasName);
menuVO.setName(funcInfo.name);
- menuVO.getMeta().put("keepAlive",false);
+ menuVO.getMeta().put("keepAlive",true);
menuVO.setSort((int) funcInfo.seq);
+ menuVO.setRemark(funcInfo.desc);
if(this.checkChildObject(menuVO.getId()) == 0){
menuVO.setHasChildren(false);
}else{
@@ -649,12 +652,13 @@
functionVO.setFunctionType(menu.functionType);
functionVO.setIsValid(menu.isValid);
functionVO.setPath(menu.resourceB);
- functionVO.setCode(menu.aliasName);
+ //functionVO.setCode(menu.aliasName);
functionVO.setAlias(menu.aliasName);
functionVO.setParentId(menu.parentId);
functionVO.setName(menu.name);
- functionVO.getMeta().put("keepAlive",false);
+ 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);
@@ -681,8 +685,9 @@
menuVO.setParentId(funcObj.parentId);
menuVO.setChildType((int) type);
menuVO.setName(funcObj.name);
- menuVO.getMeta().put("keepAlive",false);
+ 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