From e7242d40110c8a157867acd2d1a1718fb640d4c5 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期五, 17 二月 2023 16:02:04 +0800
Subject: [PATCH] fix 修正 SysTenantServiceImpl#deleteWithValidByIds 超管租户可以被删除的问题, 加上 id 校验 ; fix 修正 tenant/index.vue handleUpdate 租户套餐回显问题 ;
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
index 43f1a86..4ca909c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
@@ -22,7 +22,7 @@
* @param userId 鐢ㄦ埛ID
* @return 鑿滃崟鍒楄〃
*/
- List<SysMenu> selectMenuList(Long userId);
+ List<SysMenuVo> selectMenuList(Long userId);
/**
* 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃
@@ -31,7 +31,7 @@
* @param userId 鐢ㄦ埛ID
* @return 鑿滃崟鍒楄〃
*/
- List<SysMenu> selectMenuList(SysMenu menu, Long userId);
+ List<SysMenuVo> selectMenuList(SysMenuBo menu, Long userId);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺
@@ -66,6 +66,14 @@
List<Long> selectMenuListByRoleId(Long roleId);
/**
+ * 鏍规嵁绉熸埛濂楅ID鏌ヨ鑿滃崟鏍戜俊鎭�
+ *
+ * @param packageId 绉熸埛濂楅ID
+ * @return 閫変腑鑿滃崟鍒楄〃
+ */
+ List<Long> selectMenuListByPackageId(Long packageId);
+
+ /**
* 鏋勫缓鍓嶇璺敱鎵�闇�瑕佺殑鑿滃崟
*
* @param menus 鑿滃崟鍒楄〃
@@ -79,7 +87,7 @@
* @param menus 鑿滃崟鍒楄〃
* @return 涓嬫媺鏍戠粨鏋勫垪琛�
*/
- List<Tree<Long>> buildMenuTreeSelect(List<SysMenu> menus);
+ List<Tree<Long>> buildMenuTreeSelect(List<SysMenuVo> menus);
/**
* 鏍规嵁鑿滃崟ID鏌ヨ淇℃伅
--
Gitblit v1.9.3