| 
														
															@@ -158,6 +158,8 @@ public class SysUserController extends BaseController { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 //        if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { 
														 | 
														
														 | 
														
															 //        if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 //            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在"); 
														 | 
														
														 | 
														
															 //            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 //        } 
														 | 
														
														 | 
														
															 //        } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        // 更新密码 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         user.setUpdateBy(SecurityUtils.getUsername()); 
														 | 
														
														 | 
														
															         user.setUpdateBy(SecurityUtils.getUsername()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         return toAjax(userService.updateUser(user)); 
														 | 
														
														 | 
														
															         return toAjax(userService.updateUser(user)); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     } 
														 | 
														
														 | 
														
															     } 
														 |