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 |   66 +++++++++++++++++++++++++++++++--
 1 files changed, 62 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 d376f40..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
@@ -87,6 +87,13 @@
 	List<TreeNode> grantTree(BladeUser user);
 
 	/**
+	 * 鏍规嵁瑙掕壊id鑾峰彇鑿滃崟鏍戝舰缁撴瀯
+	 * @param roleId
+	 * @return
+	 */
+	List<TreeNode> grantTreeByRoleIds(List<Long> roleId);
+
+	/**
 	 * 椤堕儴鑿滃崟鏍戝舰缁撴瀯
 	 *
 	 * @param user
@@ -165,11 +172,62 @@
 	 * @return
 	 */
 	boolean submit(Menu menu);
+
 	/**
 	 * 鑾峰彇鑿滃崟涓嬮潰鐨勬寜閽�
-	 *
-	 * @param btmType 涓氬姟绫诲瀷
-	 * @return List<Menu>
+	 * @param classifyId
+	 * @param btmType
+	 * @param authType
+	 * @return
 	 */
-	List<Menu> getMenuButtonByType(String btmType);
+	List<Menu> getMenuButtonByType(String classifyId,String btmType, String authType);
+
+	/**
+	 * 鏍规嵁code鍜岀敤鎴穒d鏌ヨ鑿滃崟淇℃伅
+	 * @param codes
+	 * @param userId
+	 * @return
+	 */
+	List<Menu> getMenuByCodes(List<String> codes,Long userId);
+
+	/**
+	 * 鏍规嵁鐖剁骇鑿滃崟鐨刢ode鏌ヨ鎸夐挳淇℃伅
+	 * @param code
+	 * @return
+	 */
+	List<Menu> getButtonByParentCode(String code);
+
+	/**
+	 * 瀵筀eepAlive鍊艰浆鎹㈡垚甯冨皵绫诲瀷杩涜灏佽
+	 *
+	 * @param childMenu
+	 * @return
+	 */
+	void handleKeepAlive(List<MenuVO> childMenu);
+
+	/**
+	 * 鍏嬮殕鍏朵粬鑿滃崟涓嬫寜閽�
+	 * @param menuId 瑕佸厠闅嗙殑鑿滃崟鎸夐挳涓婚敭
+	 * @param buttonIds 琚厠闅嗙殑鎸夐挳涓婚敭
+	 * @return
+	 */
+	R cloneMenuButton(Long menuId, List<String> buttonIds);
+
+	/**
+	 * 鏍规嵁涓婚敭鑾峰彇鑿滃崟淇℃伅
+	 * @param ids
+	 * @param menuCode
+	 * @param roleIds
+	 * @return
+	 */
+	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