diff --git a/src/main/java/org/mmga/clubs/controller/ClubController.java b/src/main/java/org/mmga/clubs/controller/ClubController.java index f71cb68..e41b5d5 100644 --- a/src/main/java/org/mmga/clubs/controller/ClubController.java +++ b/src/main/java/org/mmga/clubs/controller/ClubController.java @@ -23,4 +23,5 @@ public class ClubController { public BaseResponse getClub(@RequestParam("id") int clubId){ return clubService.getClubInformationById(clubId); } + } diff --git a/src/main/java/org/mmga/clubs/service/ClubService.java b/src/main/java/org/mmga/clubs/service/ClubService.java index ed4d575..4352041 100644 --- a/src/main/java/org/mmga/clubs/service/ClubService.java +++ b/src/main/java/org/mmga/clubs/service/ClubService.java @@ -43,6 +43,9 @@ public class ClubService { } public Club getClubByUserId(int 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());