From ea7ea2ec59a50db2fec8228efc81a63afd8283de Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 21 二月 2022 10:40:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
index aeffc40..662989e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.convert.ExcelDictConvert;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
@@ -132,11 +133,7 @@
@ApiModelProperty(value = "鏄惁绠＄悊鍛�")
public boolean isAdmin() {
- return isAdmin(this.roleId);
- }
-
- public static boolean isAdmin(Long roleId) {
- return roleId != null && 1L == roleId;
+ return UserConstants.ADMIN_ID.equals(this.roleId);
}
}
--
Gitblit v1.9.3