From 9c67a9d48ec6a71e2d4edf11fae3f5e802a97bff Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 19 十一月 2024 16:35:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
index c053571..08ded69 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
@@ -263,7 +263,7 @@
}
MenuVO functionVO = new MenuVO();
functionVO.setId(menu.id);
- functionVO.setSource(menu.icon);
+ functionVO.setSource(menu.image);
//if(StringUtils.isBlank(menu.resourceB)){
// continue;
//}
@@ -341,6 +341,7 @@
menuVO.setIsValid(info.isValid);
menuVO.setHasChildren(false);
menuVO.setCategory(1);
+ menuVO.setFunctionType(2);
menuVOList.add(menuVO);
}
}
@@ -421,6 +422,7 @@
menuVO.setCode(operateInfo.identify);
menuVO.setAlias(operateInfo.alias);
menuVO.setCategory(1);
+ menuVO.setFunctionType(2);
menuVO.setChildType(0);
menuVO.setRemark(operateInfo.desc);
menuVO.getMeta().put("keepAlive",false);
@@ -447,7 +449,8 @@
MenuVO menuVO = new MenuVO();
menuVO.setId(funcInfo.id);
menuVO.setIsValid(funcInfo.isValid);
- menuVO.setSource(funcInfo.icon);
+ menuVO.setSource(funcInfo.image);
+ menuVO.setFunctionType(funcInfo.functionType);
menuVO.setPathC(funcInfo.resourceC);
menuVO.setResourceDotNet(funcInfo.resourceDotNet);
menuVO.setResourceMobile(funcInfo.resourceMobile);
@@ -496,7 +499,8 @@
}
MenuVO functionVO = new MenuVO();
functionVO.setId(menu.id);
- functionVO.setSource(menu.icon);
+ functionVO.setSource(menu.image);
+ functionVO.setFunctionType(menu.functionType);
// if(StringUtils.isBlank(menu.resourceB) ){
// continue;
// }
--
Gitblit v1.9.3