From b4645daf2a9943afb4603e30eef1897cdca157c5 Mon Sep 17 00:00:00 2001 From: zlyx <1242874891@qq.com> Date: 星期一, 06 三月 2023 13:07:05 +0800 Subject: [PATCH] add 新增 迁移 4.X EasyExcel枚举类数据翻译注解功能 ; fix 修正 !pr292 相关问题, 回退特殊类转换写法 ; --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysRoleVo.java | 11 ++++------- 1 files changed, 4 insertions(+), 7 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 3e04142..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,12 +5,13 @@ 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 @@ -19,6 +20,7 @@ */ @Data @ExcelIgnoreUnannotated +@AutoMapper(target = SysRole.class) public class SysRoleVo implements Serializable { @Serial @@ -91,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