From 2f558094d133549b7e1867c6f9d674ec04cef360 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 02 三月 2023 23:32:29 +0800 Subject: [PATCH] fix 修复 !pr292 相关问题 并优化写法 --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysRoleVo.java | 14 +++++--------- 1 files changed, 5 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..06f97a4 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 @@ -5,21 +5,22 @@ import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.excel.annotation.ExcelDictFormat; import com.ruoyi.common.excel.convert.ExcelDictConvert; +import com.ruoyi.system.domain.SysRole; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; 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 +@AutoMapper(target = SysRole.class) public class SysRoleVo implements Serializable { @Serial @@ -92,12 +93,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