|
|
@@ -70,7 +70,9 @@ public class UserService {
|
|
|
public User create(UserRegister userRegister) {
|
|
|
User user = new User();
|
|
|
BeanUtils.copyProperties(userRegister, user);
|
|
|
- if (StringUtils.isNotBlank(userRegister.getPassword())) {
|
|
|
+ if (StringUtils.isNotBlank(userRegister.getEncodedPassword())) {
|
|
|
+ user.setPassword(userRegister.getEncodedPassword());
|
|
|
+ } else if (StringUtils.isNotBlank(userRegister.getPassword())) {
|
|
|
user.setPassword(passwordEncoder.encode(userRegister.getPassword()));
|
|
|
}
|
|
|
userRepo.save(user);
|