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/domain/vo/SysRoleVo.java | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysRoleVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysRoleVo.java index e6aff11..0bc71f2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysRoleVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysRoleVo.java @@ -10,13 +10,11 @@ import java.io.Serial; import java.io.Serializable; import java.util.Date; -import java.util.Set; /** * 瑙掕壊淇℃伅瑙嗗浘瀵硅薄 sys_role * - * @author ruoyi - * @date 2023-02-01 + * @author Michelle.Chung */ @Data @ExcelIgnoreUnannotated @@ -92,12 +90,7 @@ */ private boolean flag = false; - /** - * 瑙掕壊鑿滃崟鏉冮檺 - */ - private Set<String> permissions; - - public boolean isAdmin() { + public boolean isSuperAdmin() { return UserConstants.SUPER_ADMIN_ID.equals(this.roleId); } -- Gitblit v1.9.3