From 6e21c6472843d67bfb5dd590e33207a58d41695e Mon Sep 17 00:00:00 2001 From: MichelleChung <1242874891@qq.com> Date: 星期四, 02 三月 2023 22:09:51 +0800 Subject: [PATCH] !292 mapstruct-plus 接入替换 BeanUtil * add 新增 mapstruct-plus 用于实体类转换 ; --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysRoleVo.java | 19 ++++++++++--------- 1 files changed, 10 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..318b772 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 @@ -3,23 +3,29 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.core.constant.UserConstants; +import com.ruoyi.common.core.domain.dto.RoleDTO; 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 io.github.linpeilie.annotations.AutoMappers; 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 +@AutoMappers({ + @AutoMapper(target = SysRole.class), + @AutoMapper(target = RoleDTO.class) +}) public class SysRoleVo implements Serializable { @Serial @@ -92,12 +98,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