From f1dd87abd55b8dd95a206c80c0a185d4d4919324 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 25 三月 2023 19:17:17 +0800
Subject: [PATCH] !311 fix 修复超管切换租户后 新增用户校验的租户不正确 Merge pull request !311 from Yjoioooo/5.X
---
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