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 | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 fa4f418..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
@@ -2,7 +2,9 @@
import cn.hutool.core.lang.tree.Tree;
import com.ruoyi.system.domain.SysMenu;
+import com.ruoyi.system.domain.bo.SysMenuBo;
import com.ruoyi.system.domain.vo.RouterVo;
+import com.ruoyi.system.domain.vo.SysMenuVo;
import java.util.List;
import java.util.Set;
@@ -20,7 +22,7 @@
* @param userId 鐢ㄦ埛ID
* @return 鑿滃崟鍒楄〃
*/
- List<SysMenu> selectMenuList(Long userId);
+ List<SysMenuVo> selectMenuList(Long userId);
/**
* 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃
@@ -29,7 +31,7 @@
* @param userId 鐢ㄦ埛ID
* @return 鑿滃崟鍒楄〃
*/
- List<SysMenu> selectMenuList(SysMenu menu, Long userId);
+ List<SysMenuVo> selectMenuList(SysMenuBo menu, Long userId);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺
@@ -64,6 +66,14 @@
List<Long> selectMenuListByRoleId(Long roleId);
/**
+ * 鏍规嵁绉熸埛濂楅ID鏌ヨ鑿滃崟鏍戜俊鎭�
+ *
+ * @param packageId 绉熸埛濂楅ID
+ * @return 閫変腑鑿滃崟鍒楄〃
+ */
+ List<Long> selectMenuListByPackageId(Long packageId);
+
+ /**
* 鏋勫缓鍓嶇璺敱鎵�闇�瑕佺殑鑿滃崟
*
* @param menus 鑿滃崟鍒楄〃
@@ -77,7 +87,7 @@
* @param menus 鑿滃崟鍒楄〃
* @return 涓嬫媺鏍戠粨鏋勫垪琛�
*/
- List<Tree<Long>> buildMenuTreeSelect(List<SysMenu> menus);
+ List<Tree<Long>> buildMenuTreeSelect(List<SysMenuVo> menus);
/**
* 鏍规嵁鑿滃崟ID鏌ヨ淇℃伅
@@ -85,7 +95,7 @@
* @param menuId 鑿滃崟ID
* @return 鑿滃崟淇℃伅
*/
- SysMenu selectMenuById(Long menuId);
+ SysMenuVo selectMenuById(Long menuId);
/**
* 鏄惁瀛樺湪鑿滃崟瀛愯妭鐐�
@@ -106,18 +116,18 @@
/**
* 鏂板淇濆瓨鑿滃崟淇℃伅
*
- * @param menu 鑿滃崟淇℃伅
+ * @param bo 鑿滃崟淇℃伅
* @return 缁撴灉
*/
- int insertMenu(SysMenu menu);
+ int insertMenu(SysMenuBo bo);
/**
* 淇敼淇濆瓨鑿滃崟淇℃伅
*
- * @param menu 鑿滃崟淇℃伅
+ * @param bo 鑿滃崟淇℃伅
* @return 缁撴灉
*/
- int updateMenu(SysMenu menu);
+ int updateMenu(SysMenuBo bo);
/**
* 鍒犻櫎鑿滃崟绠＄悊淇℃伅
@@ -133,5 +143,5 @@
* @param menu 鑿滃崟淇℃伅
* @return 缁撴灉
*/
- String checkMenuNameUnique(SysMenu menu);
+ String checkMenuNameUnique(SysMenuBo menu);
}
--
Gitblit v1.9.3