github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

fix bug: NullPointerException occurred when failed to login

pull/2/head
johnniang 2018-04-29 02:05:54 +08:00
parent 2432b7cc24
commit 764b86e4ad
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,6 +9,7 @@ logs/
.project
.settings
.springBeans
.sts4-cache
### IntelliJ IDEA ###
.idea

4
src/main/java/cc/ryanc/halo/service/impl/UserServiceImpl.java
View File

@ -63,7 +63,7 @@ public class UserServiceImpl implements UserService {
@Override
public User findUser() {
List<User> users = userRepository.findAll();
if(users.size()>0){
if (users != null && users.size() > 0) {
return users.get(0);
} else {
return new User();
@ -115,7 +115,7 @@ public class UserServiceImpl implements UserService {
@Override
public Integer updateUserLoginError() {
User user = this.findUser();
user.setLoginError(user.getLoginError()+1);
user.setLoginError((user.getLoginError() == null ? 0 : user.getLoginError()) + 1);
userRepository.save(user);
return user.getLoginError();
}