From bf344753fbe9e44d4bb6771a734982b44d895f6e Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期二, 31 一月 2023 21:30:01 +0800 Subject: [PATCH] update 重构 将 BaseEntity 与 TreeEntity 移动到 common-mybatis 模块 整理 core 模块依赖 --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java index a897208..3f85873 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java @@ -7,16 +7,16 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.ruoyi.common.mybatis.core.domain.BaseEntity; import com.ruoyi.common.excel.annotation.ExcelDictFormat; import com.ruoyi.common.excel.convert.ExcelDictConvert; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; import java.util.Set; /** @@ -126,6 +126,6 @@ } public boolean isAdmin() { - return UserConstants.ADMIN_ID.equals(this.roleId); + return UserConstants.SUPER_ADMIN_ID.equals(this.roleId); } } -- Gitblit v1.9.3