From f7714644f082ab599e2e5eb121b6ca5199f8a04f Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Fri, 1 Jan 2021 22:40:04 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90system=E3=80=91=E6=95=B4=E7=90=86?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modular/user/controller/SysUserController.java  |  4 ++--
 .../modular/user/factory/SysUserCreateFactory.java  | 13 ++++++-------
 .../modular/user/pojo/request/SysUserRequest.java   |  8 ++++----
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java
index 9d2cff9de..00f1169a2 100644
--- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java
+++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java
@@ -60,12 +60,12 @@ public class SysUserController {
     }
 
     /**
-     * 更新信息
+     * 更新用户个人信息
      *
      * @author luojie
      * @date 2020/11/6 13:50
      */
-    @PostResource(name = "系统用户_更新信息", path = "/sysUser/updateInfo")
+    @PostResource(name = "更新用户个人信息", path = "/sysUser/updateInfo")
     public ResponseData updateInfo(@RequestBody @Validated(SysUserRequest.updateInfo.class) SysUserRequest sysUserRequest) {
         sysUserService.updateInfo(sysUserRequest);
         return new SuccessResponseData();
diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/SysUserCreateFactory.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/SysUserCreateFactory.java
index d21477b12..3599053b2 100644
--- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/SysUserCreateFactory.java
+++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/SysUserCreateFactory.java
@@ -76,21 +76,20 @@ public class SysUserCreateFactory {
      */
     public static void fillUpdateInfo(SysUserRequest sysUserRequest, SysUser sysUser) {
 
-        // 填充头像
-        sysUser.setAvatar(sysUserRequest.getAvatar());
-
-        // 生日
-        sysUser.setBirthday(DateUtil.parse(sysUserRequest.getBirthday()));
-
         // 性别（M-男，F-女）
         sysUser.setSex(sysUserRequest.getSex());
 
         // 邮箱
         sysUser.setEmail(sysUserRequest.getEmail());
 
+        // 姓名
+        sysUser.setRealName(sysUserRequest.getRealName());
+
+        // 生日
+        sysUser.setBirthday(DateUtil.parse(sysUserRequest.getBirthday()));
+
         // 手机
         sysUser.setPhone(sysUserRequest.getPhone());
-
     }
 
 }
diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserRequest.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserRequest.java
index 1e327c27e..609fd56af 100644
--- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserRequest.java
+++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserRequest.java
@@ -62,7 +62,7 @@ public class SysUserRequest extends BaseRequest {
     /**
      * 姓名
      */
-    @NotBlank(message = "姓名不能为空", groups = {add.class, edit.class})
+    @NotBlank(message = "姓名不能为空", groups = {add.class, edit.class, updateInfo.class})
     private String realName;
 
     /**
@@ -74,7 +74,7 @@ public class SysUserRequest extends BaseRequest {
     /**
      * 生日
      */
-    @DateValue(message = "生日格式不正确，请检查birthday参数", groups = {add.class, edit.class, updateInfo.class})
+    @DateValue(message = "生日格式不正确，请检查birthday参数", groups = {add.class, edit.class})
     private String birthday;
 
     /**
@@ -92,8 +92,8 @@ public class SysUserRequest extends BaseRequest {
     /**
      * 手机
      */
-    @NotNull(message = "手机号码不能为空，请检查phone参数", groups = {add.class, edit.class, updateInfo.class})
-    @Size(min = 11, max = 11, message = "手机号码格式错误，请检查手机是否是11位", groups = {add.class, edit.class, updateInfo.class})
+    @NotNull(message = "手机号码不能为空，请检查phone参数", groups = {add.class, edit.class})
+    @Size(min = 11, max = 11, message = "手机号码格式错误，请检查手机是否是11位", groups = {add.class, edit.class})
     private String phone;
 
     /**