From 2eb5f8645abbb13f9c358120a6ff53cfb9772dd3 Mon Sep 17 00:00:00 2001 From: ludc <ludc@vci-tech.com> Date: 星期一, 06 一月 2025 14:39:36 +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 | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 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..5b7405f 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 @@ -415,10 +415,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)); @@ -571,7 +571,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,10 +602,10 @@ 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); if(this.checkChildObject(menuVO.getId()) == 0){ menuVO.setHasChildren(false); @@ -649,11 +649,11 @@ 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.setChildren(findChildFunctionVO(menu.id,map)); if(functionVO.getChildren().size() > 0){ @@ -681,7 +681,7 @@ 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); findChildAuthFunctionVO(menuVO, isAll); functionVO.getChildren().add(menuVO); -- Gitblit v1.9.3