public/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-03-23 22:04:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 优化 框架代码书写格式

Browse Source
This commit is contained in:
疯狂的狮子li
2023-01-30 18:08:53 +08:00
committed by zlyx
parent 912b14c288
commit 1e1c79f163
13 changed files with 64 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java
View File

@@ -10,13 +10,13 @@ import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.web.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 class SysRole extends BaseEntity {
}
public boolean isAdmin() {
return UserConstants.ADMIN_ID.equals(this.roleId);
return UserConstants.SUPER_ADMIN_ID.equals(this.roleId);
}
}

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java
View File

@@ -6,13 +6,13 @@ 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.core.xss.Xss;
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 class SysUser extends BaseEntity {
}
public boolean isAdmin() {
return UserConstants.ADMIN_ID.equals(this.userId);
return UserConstants.SUPER_ADMIN_ID.equals(this.userId);
}
}