From 7577e0d40354021d70b78d58b712ff8c2e8ad485 Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期五, 03 一月 2025 10:47:33 +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 | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 f241c1e..1608adc 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
@@ -58,12 +58,12 @@
/**
* 鑿滃崟鐨勬牴鑺傜偣涓婚敭锛岃繖涓槸骞冲彴瀹氫箟鐨�
*/
- private final String ROOT_MENU_ID = "modelManagmentNode";
+ private final String ROOT_MENU_ID = "business";
/**
* 绠＄悊鍔熻兘妯″潡鑿滃崟鏍硅妭鐐�
*/
- private final String SYSTEMMANAGMENTNODE = "systemManagmentNode";
+ private final String SYSTEMMANAGMENTNODE = "system";
/**
* 鎿嶄綔绫诲瀷绠＄悊鑿滃崟鏍硅妭鐐�
@@ -415,7 +415,7 @@
//}
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);
@@ -461,7 +461,7 @@
return menuVOList;
}
boolean isFunctionObject = Func.isNotBlank(modeType) && modeType.equalsIgnoreCase("FunctionObject");
- if(parentId.equals("systemManagmentNode") || parentId.equals("modelManagmentNode") || isFunctionObject){
+ if(parentId.equals("system") || parentId.equals("business") || isFunctionObject){
int childType = this.checkChildObject(parentId);
if(isFunctionObject){
try {
@@ -522,9 +522,9 @@
try{
MenuVO parentNode = null;
//灏嗚繑鍥炵殑鑺傜偣澶栧眰濂椾笂褰撳墠鐖惰妭鐐�
- if("systemManagmentNode".equals(parentId)){
+ if("system".equals(parentId)){
parentNode = JsonConfigReader.getSysModuleConf().getSystemManagmentNode();
- }else if("modelManagmentNode".equals(parentId)){
+ }else if("business".equals(parentId)){
parentNode = JsonConfigReader.getSysModuleConf().getModelManagmentNode();
}
//濡傛灉鏌ヨ鐨勬槸绗竴灞傝妭鐐瑰氨闇�瑕佺洿鎺ヨ繑鍥瀞ystemManagmentNode鎴杕odelManagmentNode鑺傜偣
@@ -601,7 +601,7 @@
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);
--
Gitblit v1.9.3