|
|
|
@@ -87,9 +87,10 @@ public class MallUserInfoController { |
|
|
|
public ResultData updateUser(@RequestBody MallUserInfo userInfo){ |
|
|
|
Assert.notNull(userInfo.getUsername(), "用户名不能为空"); |
|
|
|
Assert.isTrue(checkUnique(userInfo.getUsername(), 1), "重复的用户名"); |
|
|
|
Assert.notNull(userInfo.getPassword(), "密码不能为空"); |
|
|
|
PasswordHelper passwordHelper = new PasswordHelper(); |
|
|
|
passwordHelper.encryptPassword(userInfo); |
|
|
|
// Assert.notNull(userInfo.getPassword(), "密码不能为空"); |
|
|
|
// PasswordHelper passwordHelper = new PasswordHelper(); |
|
|
|
// passwordHelper.encryptPassword(userInfo); |
|
|
|
userInfo.setPassword(null); |
|
|
|
userInfoService.saveOrUpdate(userInfo); |
|
|
|
if(userInfo.getRoleId()!=null) { |
|
|
|
userRoleService.deleteByUserId(userInfo.getId()); |
|
|
|
|