作者 RuoYi

优化代码

@@ -60,27 +60,22 @@ public class SysProfileController extends BaseController @@ -60,27 +60,22 @@ public class SysProfileController extends BaseController
60 public AjaxResult updateProfile(@RequestBody SysUser user) 60 public AjaxResult updateProfile(@RequestBody SysUser user)
61 { 61 {
62 LoginUser loginUser = getLoginUser(); 62 LoginUser loginUser = getLoginUser();
63 - SysUser sysUser = loginUser.getUser();  
64 - user.setUserName(sysUser.getUserName());  
65 - if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) 63 + SysUser currentUser = loginUser.getUser();
  64 + currentUser.setNickName(user.getNickName());
  65 + currentUser.setEmail(user.getEmail());
  66 + currentUser.setPhonenumber(user.getPhonenumber());
  67 + currentUser.setSex(user.getSex());
  68 + if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser))
66 { 69 {
67 return error("修改用户'" + user.getUserName() + "'失败,手机号码已存在"); 70 return error("修改用户'" + user.getUserName() + "'失败,手机号码已存在");
68 } 71 }
69 - if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) 72 + if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser))
70 { 73 {
71 return error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在"); 74 return error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在");
72 } 75 }
73 - user.setUserId(sysUser.getUserId());  
74 - user.setPassword(null);  
75 - user.setAvatar(null);  
76 - user.setDeptId(null);  
77 if (userService.updateUserProfile(user) > 0) 76 if (userService.updateUserProfile(user) > 0)
78 { 77 {
79 // 更新缓存用户信息 78 // 更新缓存用户信息
80 - sysUser.setNickName(user.getNickName());  
81 - sysUser.setPhonenumber(user.getPhonenumber());  
82 - sysUser.setEmail(user.getEmail());  
83 - sysUser.setSex(user.getSex());  
84 tokenService.setLoginUser(loginUser); 79 tokenService.setLoginUser(loginUser);
85 return success(); 80 return success();
86 } 81 }
@@ -47,8 +47,9 @@ public abstract class RepeatSubmitInterceptor implements HandlerInterceptor @@ -47,8 +47,9 @@ public abstract class RepeatSubmitInterceptor implements HandlerInterceptor
47 /** 47 /**
48 * 验证是否重复提交由子类实现具体的防重复提交的规则 48 * 验证是否重复提交由子类实现具体的防重复提交的规则
49 * 49 *
50 - * @param request  
51 - * @return 50 + * @param request 请求信息
  51 + * @param annotation 防重复注解参数
  52 + * @return 结果
52 * @throws Exception 53 * @throws Exception
53 */ 54 */
54 public abstract boolean isRepeatSubmit(HttpServletRequest request, RepeatSubmit annotation); 55 public abstract boolean isRepeatSubmit(HttpServletRequest request, RepeatSubmit annotation);