diff --git a/.idea/modules/clubs.main.iml b/.idea/modules/clubs.main.iml index afc1871..cc1e2ab 100644 --- a/.idea/modules/clubs.main.iml +++ b/.idea/modules/clubs.main.iml @@ -3,6 +3,7 @@ + \ No newline at end of file diff --git a/src/main/java/org/mmga/clubs/service/ClubService.java b/src/main/java/org/mmga/clubs/service/ClubService.java index ed4d575..2b64d86 100644 --- a/src/main/java/org/mmga/clubs/service/ClubService.java +++ b/src/main/java/org/mmga/clubs/service/ClubService.java @@ -41,8 +41,11 @@ public class ClubService { club.setCommit(clubById.commit()); return club; } - public Club getClubByUserId(int userId){ + public Club getClubByUserId(Integer userId){ ClubUserAuthVo clubUserAuthVoByUserId = this.clubUserAuthDao.getClubUserAuthVoByUserId(userId); + if (clubUserAuthVoByUserId == null){ + return null; + } int i = clubUserAuthVoByUserId.authId(); Auth auth = i != -1 ? authService.getAuthById(i) : null; Club clubById = getClubWithoutAuthById(clubUserAuthVoByUserId.clubId());