From a01ccffc7188d6b53a374e1dc7f04aaec61a6dfa Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 13 Oct 2021 09:33:33 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=20=E4=B8=8D=E8=83=BD=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/system/controller/SysUserController.java  | 6 ++++--
 .../main/java/com/jero/modules/system/entity/SysUser.java  | 7 +++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
index d048985e..bfd3c3ef 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
@@ -364,6 +364,8 @@ public class SysUserController {
 	@RequestMapping(value = "/edit", method = RequestMethod.POST)
 	public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
         String rsaPublicKey = jsonObject.getString("rsaPublicKey");
+        String roles = jsonObject.getString("selectedroles");
+        String departs = jsonObject.getString("selecteddeparts");
         String rsaPrivateKey = String.valueOf(redisUtil.get(rsaPublicKey));
         Result<SysUser> result = new Result<SysUser>();
         SysUser sysUser = sysUserService.getById(jsonObject.getString("id"));
@@ -386,6 +388,8 @@ public class SysUserController {
             //2:把解密的数据进行校验
             user.setEmail(email);
             user.setPhone(phone);
+            user.setDepartIds(departs);
+            user.setRoleIds(roles);
             ValidUtil.validate(user);
             //3:把数据加密在放回来
             email = PasswordUtil.encrypt(email);
@@ -420,8 +424,6 @@ public class SysUserController {
             user.setUpdateTime(new Date());
             //String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), sysUser.getSalt());
             user.setPassword(sysUser.getPassword());
-            String roles = jsonObject.getString("selectedroles");
-            String departs = jsonObject.getString("selecteddeparts");
             sysUserService.editUserWithRole(user, roles);
             sysUserService.editUserWithDepart(user, departs);
             sysUserService.updateNullPhoneEmail();
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
index 2c1eb0a3..7c52131a 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
@@ -100,14 +100,14 @@ public class SysUser implements Serializable {
      * 电话
      */
     @Excel(name = "手机号", width = 15)
-    @NotBlank(message = "手机号不能为空！")
+    @NotBlank(message = "手机号不能为空")
     @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误")
     private String phone;
 
     /**
      * 角色类型
      */
-    @NotBlank(message = "角色类型不能为空！")
+    @NotBlank(message = "角色类型不能为空")
     @Excel(name="角色类型",width = 15,dictTable ="sys_role",dicText = "role_name",dicCode = "id")
     @Dict(dictTable ="sys_role",dicText = "role_name",dicCode = "id")
     private String roleIds;
@@ -115,7 +115,7 @@ public class SysUser implements Serializable {
     /**
      * 组织机构
      */
-    @NotBlank(message = "组织机构不能为空！")
+    @NotBlank(message = "组织机构不能为空")
     @Excel(name="组织机构",width = 15,dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
     @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
     private String departIds;
@@ -141,7 +141,6 @@ public class SysUser implements Serializable {
      * 邮箱密码
      */
     @NotBlank(message = "邮箱密码不能为空")
-    @Size(max = 50,message = "邮箱密码最长为50字符")
     @Excel(name="邮箱密码",width = 15,exportConvert = true)
     @ApiModelProperty(value = "邮箱密码")
     private String emailPassword;