From aa29f1cec531cd394618b06a0e99ef253a91a8fa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 27 三月 2023 11:44:43 +0800
Subject: [PATCH] !312 统一注入变量命名规则 Merge pull request !312 from Yjoioooo/5.X
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java
index 286f678..c2a3309 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java
@@ -5,8 +5,11 @@
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.sensitive.annotation.Sensitive;
import com.ruoyi.common.sensitive.core.SensitiveStrategy;
+import com.ruoyi.system.domain.SysUser;
+import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -17,13 +20,13 @@
/**
* 鐢ㄦ埛淇℃伅涓氬姟瀵硅薄 sys_user
*
- * @author ruoyi
- * @date 2023-02-01
+ * @author Michelle.Chung
*/
@Data
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysUser.class, reverseConvertGenerate = false)
public class SysUserBo extends BaseEntity {
/**
@@ -108,6 +111,7 @@
/**
* 瑙掕壊缁�
*/
+ @Size(min = 1, message = "鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖")
private Long[] roleIds;
/**
@@ -124,7 +128,7 @@
this.userId = userId;
}
- public boolean isAdmin() {
+ public boolean isSuperAdmin() {
return UserConstants.SUPER_ADMIN_ID.equals(this.userId);
}
--
Gitblit v1.9.3