LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug 不能编辑用户

Browse Source
This commit is contained in:
lijiarao
2021-10-13 09:33:45 +08:00
parent af9f017752
commit a01ccffc71
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+4 -2
View File
@@ -364,6 +364,8 @@ public class SysUserController {
@RequestMapping(value = "/edit", method = RequestMethod.POST) @RequestMapping(value = "/edit", method = RequestMethod.POST)
public Result<SysUser> edit(@RequestBody JSONObject jsonObject) { public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
String rsaPublicKey = jsonObject.getString("rsaPublicKey"); String rsaPublicKey = jsonObject.getString("rsaPublicKey");
String roles = jsonObject.getString("selectedroles");
String departs = jsonObject.getString("selecteddeparts");
String rsaPrivateKey = String.valueOf(redisUtil.get(rsaPublicKey)); String rsaPrivateKey = String.valueOf(redisUtil.get(rsaPublicKey));
Result<SysUser> result = new Result<SysUser>(); Result<SysUser> result = new Result<SysUser>();
SysUser sysUser = sysUserService.getById(jsonObject.getString("id")); SysUser sysUser = sysUserService.getById(jsonObject.getString("id"));
@@ -386,6 +388,8 @@ public class SysUserController {
//2:把解密的数据进行校验 //2:把解密的数据进行校验
user.setEmail(email); user.setEmail(email);
user.setPhone(phone); user.setPhone(phone);
user.setDepartIds(departs);
user.setRoleIds(roles);
ValidUtil.validate(user); ValidUtil.validate(user);
//3:把数据加密在放回来 //3:把数据加密在放回来
email = PasswordUtil.encrypt(email); email = PasswordUtil.encrypt(email);
@@ -420,8 +424,6 @@ public class SysUserController {
user.setUpdateTime(new Date()); user.setUpdateTime(new Date());
//String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), sysUser.getSalt()); //String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), sysUser.getSalt());
user.setPassword(sysUser.getPassword()); user.setPassword(sysUser.getPassword());
String roles = jsonObject.getString("selectedroles");
String departs = jsonObject.getString("selecteddeparts");
sysUserService.editUserWithRole(user, roles); sysUserService.editUserWithRole(user, roles);
sysUserService.editUserWithDepart(user, departs); sysUserService.editUserWithDepart(user, departs);
sysUserService.updateNullPhoneEmail(); sysUserService.updateNullPhoneEmail();
jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
+3 -4
View File
@@ -100,14 +100,14 @@ public class SysUser implements Serializable {
* 电话 * 电话
*/ */
@Excel(name = "手机号", width = 15) @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 = "手机号码格式错误") @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; private String phone;
/** /**
* 角色类型 * 角色类型
*/ */
@NotBlank(message = "角色类型不能为空！") @NotBlank(message = "角色类型不能为空")
@Excel(name="角色类型",width = 15,dictTable ="sys_role",dicText = "role_name",dicCode = "id") @Excel(name="角色类型",width = 15,dictTable ="sys_role",dicText = "role_name",dicCode = "id")
@Dict(dictTable ="sys_role",dicText = "role_name",dicCode = "id") @Dict(dictTable ="sys_role",dicText = "role_name",dicCode = "id")
private String roleIds; 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") @Excel(name="组织机构",width = 15,dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
@Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
private String departIds; private String departIds;
@@ -141,7 +141,6 @@ public class SysUser implements Serializable {
* 邮箱密码 * 邮箱密码
*/ */
@NotBlank(message = "邮箱密码不能为空") @NotBlank(message = "邮箱密码不能为空")
@Size(max = 50,message = "邮箱密码最长为50字符")
@Excel(name="邮箱密码",width = 15,exportConvert = true) @Excel(name="邮箱密码",width = 15,exportConvert = true)
@ApiModelProperty(value = "邮箱密码") @ApiModelProperty(value = "邮箱密码")
private String emailPassword; private String emailPassword;