修改用户新增可以修改密码
This commit is contained in:
@@ -196,12 +196,13 @@ public class UserController extends BaseController {
|
|||||||
public ApiResult<?> update(@RequestBody User user) {
|
public ApiResult<?> update(@RequestBody User user) {
|
||||||
user.setStatus(null);
|
user.setStatus(null);
|
||||||
user.setUsername(null);
|
user.setUsername(null);
|
||||||
user.setPassword(null);
|
|
||||||
if (user.getPassword() != null) {
|
if (user.getPassword() != null) {
|
||||||
String pwd = userService.encodePassword(user.getPassword());
|
String pwd = userService.encodePassword(user.getPassword());
|
||||||
User originData = userService.getByIdRel(user.getUserId());
|
User originData = userService.getByIdRel(user.getUserId());
|
||||||
if(!pwd.equals(originData.getPassword())) {
|
if(!pwd.equals(originData.getPassword())) {
|
||||||
user.setPassword(pwd);
|
user.setPassword(pwd);
|
||||||
|
}else {
|
||||||
|
user.setPassword(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (userService.updateUser(user)) {
|
if (userService.updateUser(user)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user