diff --git a/src/main/java/org/mmga/clubs/entities/user/UserVo.java b/src/main/java/org/mmga/clubs/entities/user/UserVo.java index 8afcce0..9a6cc1d 100644 --- a/src/main/java/org/mmga/clubs/entities/user/UserVo.java +++ b/src/main/java/org/mmga/clubs/entities/user/UserVo.java @@ -2,5 +2,5 @@ package org.mmga.clubs.entities.user; import java.util.Date; -public record UserVo(int id, String name, String password, int auth, String avatar, Date createTime, Date updateTime) { +public record UserVo(Integer id, String name, String password, int auth, String avatar, Date createTime, Date updateTime) { } diff --git a/src/main/java/org/mmga/clubs/service/ClubService.java b/src/main/java/org/mmga/clubs/service/ClubService.java index ed4d575..44bc5cb 100644 --- a/src/main/java/org/mmga/clubs/service/ClubService.java +++ b/src/main/java/org/mmga/clubs/service/ClubService.java @@ -41,7 +41,10 @@ public class ClubService { club.setCommit(clubById.commit()); return club; } - public Club getClubByUserId(int userId){ + public Club getClubByUserId(Integer userId){ + if (userId == null){ + return null; + } ClubUserAuthVo clubUserAuthVoByUserId = this.clubUserAuthDao.getClubUserAuthVoByUserId(userId); int i = clubUserAuthVoByUserId.authId(); Auth auth = i != -1 ? authService.getAuthById(i) : null;