From c00c9ba386b367deb76fa438eaed9ef5dd371d03 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 27 三月 2023 14:00:21 +0800
Subject: [PATCH] !314 遗漏数据验证后return Merge pull request !314 from Yjoioooo/5.X

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 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 10dd782..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 {
 
     /**
@@ -78,7 +81,7 @@
     /**
      * 澶村儚鍦板潃
      */
-    private String avatar;
+    private Long avatar;
 
     /**
      * 瀵嗙爜
@@ -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