From db331894dca28ceadb69f53194a4a62edb9ce9e5 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 13 十二月 2023 11:50:30 +0800 Subject: [PATCH] 特殊字符转义类修改,pom调整打包方式,编写systemctl命令方式启动脚本 --- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java index 035269d..8e3fd78 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java @@ -74,6 +74,7 @@ @Override public List<MenuVO> lazyList(Long parentId, Map<String, Object> param) { + //int i = 1 / 0; if (Func.isEmpty(Func.toStr(param.get(PARENT_ID)))) { parentId = null; } @@ -159,6 +160,17 @@ // 淇敼涓烘墍鏈夌敤鎴烽兘鑳芥煡璇㈡墍鏈夛紝鍥犱负娌℃潈闄愮殑鐢ㄦ埛涓嶅叿澶囪繖涓彍鍗曢〉闈㈢殑鏉冮檺锛屼篃灏辨病蹇呰闄愬埗鐢ㄦ埛鏌ヨ嚜宸辩殑 List<TreeNode> menuTree = baseMapper.grantTree(); return ForestNodeMerger.merge(tenantPackageTree(menuTree, user.getTenantId())); + } + + /** + * 鏍规嵁瑙掕壊id鑾峰彇鑿滃崟鏍戝舰缁撴瀯 + * @param roleId + * @return + */ + @Override + public List<TreeNode> grantTreeByRoleIds(List<Long> roleId) { + List<TreeNode> menuTree = baseMapper.grantTreeByRole(roleId); + return ForestNodeMerger.merge(menuTree); } @Override @@ -317,7 +329,7 @@ * @return List<Menu> */ @Override - @Cacheable(cacheNames = MENU_CACHE, key = "'auth:menuButton:'+ #btmType +':'+ #userId ") + //@Cacheable(cacheNames = MENU_CACHE, key = "'auth:menuButton:'+ #btmType +':'+ #userId ") public List<Menu> getMenuButtonByType(String btmType,Long userId) { List<String> roleIds = null; if(!VciBaseUtil.checkAdminTenant()){ -- Gitblit v1.9.3