From 4ec2638f48123a16d2d55674b29c71407193a4a9 Mon Sep 17 00:00:00 2001
From: hujiebin <iamhujiebin@users.noreply.github.com>
Date: Thu, 15 Jun 2023 11:01:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=BF=9B=E5=9C=BA=E7=89=B9=E6=95=88?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 route/group_r/group_info.go | 48 +++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/route/group_r/group_info.go b/route/group_r/group_info.go
index 294264c..ce92b26 100644
--- a/route/group_r/group_info.go
+++ b/route/group_r/group_info.go
@@ -610,37 +610,33 @@ func GetRoomInfo(c *gin.Context) (*mycontext.MyContext, error) {
 	}
 	// 进场特效类型
 	var entryEffectType int // 进场特效类型 1: CP 2:神秘人 3:贵族 4:vip ,顺序从小到大
-	if result.Owner != nil && result.Owner.Id != nil {
-		if cp, _ := rpc.GetUserCp(model, *result.Owner.Id); cp != nil {
-			result.CpLevel = cp.CpLevel.Level
-			if cp.CpUserInfo != nil && cp.CpUserInfo.Avatar != nil {
-				result.CpUserAvatar = *cp.CpUserInfo.Avatar
+	var cpEntryEffect bool
+	if cp, _ := rpc.GetUserCp(model, userId); cp != nil {
+		for _, v := range cp.MyPrivilegeList {
+			if v.Type == 5 {
+				cpEntryEffect = true
 			}
 		}
-		var cpEntryEffect bool
-		if cp, _ := rpc.GetUserCp(model, userId); cp != nil {
-			for _, v := range cp.MyPrivilegeList {
-				if v.Type == 5 {
-					cpEntryEffect = true
-				}
-			}
-		}
-		if result.Owner.IsVip {
-			entryEffectType = 4
-		}
-		if result.Owner.Noble.Level > 0 {
-			entryEffectType = 3
-		}
-		for _, v := range result.Owner.Svip.Privileges {
-			if len(v.MysteryCode) > 0 {
-				entryEffectType = 2
-			}
+		result.CpLevel = cp.CpLevel.Level
+		if cp.CpUserInfo != nil && cp.CpUserInfo.Avatar != nil {
+			result.CpUserAvatar = *cp.CpUserInfo.Avatar
 		}
-		if cpEntryEffect {
-			entryEffectType = 1
+	}
+	if result.Owner.IsVip {
+		entryEffectType = 4
+	}
+	if result.Owner.Noble.Level > 0 {
+		entryEffectType = 3
+	}
+	for _, v := range result.Owner.Svip.Privileges {
+		if len(v.MysteryCode) > 0 {
+			entryEffectType = 2
 		}
-		result.EntryEffectType = entryEffectType
 	}
+	if cpEntryEffect {
+		entryEffectType = 1
+	}
+	result.EntryEffectType = entryEffectType
 
 	resp.ResponseOk(c, result)
 	return myContext, nil
-- 
2.22.0