From 92417c2442e197fb80969ba6224d8004a2975f6a Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Tue, 5 Dec 2023 15:34:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=B7=A5=E4=BC=9A=E4=BC=9A?=
 =?UTF-8?q?=E9=95=BF=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/comp_configure.go         | 2 +-
 modules/sociaty/api_cross_mine.go | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/comp_configure.go b/modules/comp_configure.go
index 32b8bfd7b..27b580c06 100644
--- a/modules/comp_configure.go
+++ b/modules/comp_configure.go
@@ -14,7 +14,7 @@ import (
 const (
 	//game_gamecolor = "game_gamecolor.json" //颜色表
 	game_playerlv = "game_playerlv.json" //玩家等级
-	//game_facemod  = "game_facemod.json"  //形象配置表
+	//game_facemod  = "game_facemod.json"  	//形象配置表
 	game_drop = "game_drop.json" //掉落
 	new_hero  = "game_hero.json"
 	// 签到
diff --git a/modules/sociaty/api_cross_mine.go b/modules/sociaty/api_cross_mine.go
index 1135589e5..d1432a0bc 100644
--- a/modules/sociaty/api_cross_mine.go
+++ b/modules/sociaty/api_cross_mine.go
@@ -74,10 +74,10 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (er
 			}
 		}
 	}
-
+	master := this.module.modelSociaty.getMasterInfo(sociaty)
 	if sociaty.AccuseTime > 0 {
 		// 获取会长
-		master := this.module.modelSociaty.getMasterInfo(sociaty)
+
 		if master != nil {
 			if master.Uid == session.GetUserId() { //自己是会长
 				sociaty.AccuseTime = 0
@@ -99,7 +99,11 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (er
 					rsp.Master = master
 				}
 			}
+		} else {
+			rsp.Master = master
 		}
+	} else {
+		rsp.Master = master
 	}
 	rsp.Sociaty = sociaty
 	session.SendMsg(string(this.module.GetType()), SociatySubTypeMine, rsp)