From f09e05514d9a9e2623cfa73c4de1ffa98bb30bf8 Mon Sep 17 00:00:00 2001 From: xiejun <xiejun@vci-tech.com> Date: 星期二, 23 一月 2024 10:09:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java index c49017d..0708dd5 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java @@ -175,10 +175,12 @@ /** * 鑾峰彇鑿滃崟涓嬮潰鐨勬寜閽� - * @param btmType 涓氬姟绫诲瀷 - * @return List<Menu> + * @param classifyId + * @param btmType + * @param authType + * @return */ - List<Menu> getMenuButtonByType(String btmType,Long userId); + List<Menu> getMenuButtonByType(String classifyId,String btmType, String authType); /** * 鏍规嵁code鍜岀敤鎴穒d鏌ヨ鑿滃崟淇℃伅 @@ -214,7 +216,18 @@ /** * 鏍规嵁涓婚敭鑾峰彇鑿滃崟淇℃伅 * @param ids + * @param menuCode + * @param roleIds * @return */ - List<Menu> getMenuListById(List<String> ids,String parentId); + List<Menu> getMenuListByCode(List<String> ids,String menuCode,String roleIds); + + /** + * 鏍规嵁瑙掕壊id鑾峰彇宸叉巿鏉冪殑鎸夐挳淇℃伅 + * @param roleId + * @param menuCode + * @return + */ + List<Menu> getButtonsByRoleId(String roleId, String menuCode); + } -- Gitblit v1.9.3