mirror of https://github.com/elunez/eladmin
Merge 2.5dev
commit
d6bd1d972c
|
@ -91,8 +91,8 @@ public class UserServiceImpl implements UserService {
|
||||||
public void update(User resources) {
|
public void update(User resources) {
|
||||||
User user = userRepository.findById(resources.getId()).orElseGet(User::new);
|
User user = userRepository.findById(resources.getId()).orElseGet(User::new);
|
||||||
ValidationUtil.isNull(user.getId(),"User","id",resources.getId());
|
ValidationUtil.isNull(user.getId(),"User","id",resources.getId());
|
||||||
User user1 = userRepository.findByUsername(user.getUsername());
|
User user1 = userRepository.findByUsername(resources.getUsername());
|
||||||
User user2 = userRepository.findByEmail(user.getEmail());
|
User user2 = userRepository.findByEmail(resources.getEmail());
|
||||||
|
|
||||||
if(user1 !=null&&!user.getId().equals(user1.getId())){
|
if(user1 !=null&&!user.getId().equals(user1.getId())){
|
||||||
throw new EntityExistException(User.class,"username",resources.getUsername());
|
throw new EntityExistException(User.class,"username",resources.getUsername());
|
||||||
|
|
Loading…
Reference in New Issue