From 652359714c427195e3ecedc8f2cfd8f729f76a3b Mon Sep 17 00:00:00 2001
From: wzp <minecraftwzpmc@163.com>
Date: Mon, 6 May 2024 17:16:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=97=A0?=
 =?UTF-8?q?=E7=A4=BE=E5=9B=A2=E7=94=A8=E6=88=B7=E6=97=A0=E6=B3=95=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/org/mmga/clubs/entities/user/UserVo.java | 2 +-
 src/main/java/org/mmga/clubs/service/ClubService.java  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

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;