From 2787212362c5a23bf5dd94b1bb9cae4ec3fe4caa Mon Sep 17 00:00:00 2001 From: MichelleChung <1242874891@qq.com> Date: 星期五, 03 二月 2023 09:47:41 +0800 Subject: [PATCH] !284 更新常量 GenConstants,优化 Map 返回结构 * update 优化返回结构, 将 Map 改为指定 Vo 对象 ; * update GenConstants 扩展数据库数据类型, 更新 BO, VO, ENTITY 字段, 并移动到 generator 模块 ; --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java index d604a94..4abfa78 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java @@ -1,18 +1,18 @@ package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.*; -import com.ruoyi.common.core.annotation.Sensitive; import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.enums.SensitiveStrategy; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.ruoyi.common.mybatis.core.domain.BaseEntity; import com.ruoyi.common.core.xss.Xss; +import com.ruoyi.common.sensitive.annotation.Sensitive; +import com.ruoyi.common.sensitive.core.SensitiveStrategy; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; import java.util.Date; import java.util.List; @@ -154,7 +154,7 @@ } public boolean isAdmin() { - return UserConstants.ADMIN_ID.equals(this.userId); + return UserConstants.SUPER_ADMIN_ID.equals(this.userId); } } -- Gitblit v1.9.3