From cfe87600c3da9aa8ee952488ebb3d277e1a35fb9 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 17 Jul 2023 14:01:30 +0800
Subject: [PATCH] =?UTF-8?q?#27827=20=E7=BC=BA=E9=99=B7=20=E3=80=90?=
 =?UTF-8?q?=E6=A2=A6=E5=B7=A5=E5=9C=BA=E7=B3=BB=E7=BB=9F=E3=80=91=20<-?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF->=20=E3=80=90=E7=8E=A9=E5=AE=B6=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=91=E6=B2=A1=E6=9C=89=E9=80=9A=E5=85=B3=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=20=20=E7=89=88=E7=BD=B2=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/hunting/model_rank.go | 32 +++++++++++++++++++++++++-------
 modules/hunting/module.go     |  2 +-
 modules/pagoda/model_rank.go  |  2 +-
 modules/viking/model_rank.go  | 34 ++++++++++++++++++++++++++--------
 modules/viking/module.go      |  2 +-
 5 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/modules/hunting/model_rank.go b/modules/hunting/model_rank.go
index 00613dbce..722694d82 100644
--- a/modules/hunting/model_rank.go
+++ b/modules/hunting/model_rank.go
@@ -48,13 +48,31 @@ func (this *ModelRank) getHuntingRankList(uid string) []*pb.DBHuntingRank {
 
 func (this *ModelRank) getHuntingRankListByBossType(uid string, bossType int32) *pb.DBHuntingRank {
 	ranks := make([]*pb.DBHuntingRank, 0)
-	err := this.GetList(uid, &ranks)
-	if err != nil {
-		return nil
-	}
-	for _, v := range ranks {
-		if v.Bosstype == bossType {
-			return v
+	if db.IsCross() {
+		err := this.GetList(uid, &ranks)
+		if err != nil {
+			return nil
+		}
+		for _, v := range ranks {
+			if v.Bosstype == bossType {
+				return v
+			}
+		}
+	} else {
+		conn, err := db.Cross()
+		if err != nil {
+			return nil
+		}
+		model := db.NewDBModel(comm.TableHuntingRank, 0, conn)
+
+		err = model.GetList(uid, &ranks)
+		if err != nil {
+			return nil
+		}
+		for _, v := range ranks {
+			if v.Bosstype == bossType {
+				return v
+			}
 		}
 	}
 	return nil
diff --git a/modules/hunting/module.go b/modules/hunting/module.go
index 2bf432385..cbc3fecaf 100644
--- a/modules/hunting/module.go
+++ b/modules/hunting/module.go
@@ -74,7 +74,7 @@ func (this *Hunting) ModifyHuntingData(uid string, data map[string]interface{})
 
 func (this *Hunting) CheckUserBaseHuntingInfo(uid string) (data []*pb.DBHuntingRank) {
 	list, err := this.modelHunting.getHuntingList(uid)
-	if err != nil {
+	if err == nil {
 		for k := range list.Boss {
 			_d := this.modulerank.getHuntingRankListByBossType(uid, k)
 			if _d != nil {
diff --git a/modules/pagoda/model_rank.go b/modules/pagoda/model_rank.go
index c78e89980..e5148d4d8 100644
--- a/modules/pagoda/model_rank.go
+++ b/modules/pagoda/model_rank.go
@@ -44,7 +44,7 @@ func (this *ModelRank) getPagodaRankListByFloorid(uid string, cid int32) *pb.DBP
 	} else {
 		if conn, err := db.Cross(); err == nil {
 			dbModel := db.NewDBModel(comm.TablePagodaRecord, 0, conn)
-			if err = dbModel.GetList(uid, &pagodaRank); err == nil {
+			if err = dbModel.GetList(uid, &pagodaRank); err != nil {
 				return nil
 			}
 		}
diff --git a/modules/viking/model_rank.go b/modules/viking/model_rank.go
index 681e9014f..a2f17f562 100644
--- a/modules/viking/model_rank.go
+++ b/modules/viking/model_rank.go
@@ -47,14 +47,32 @@ func (this *ModelRank) getVikingRankList(uid string) []*pb.DBVikingRank {
 }
 
 func (this *ModelRank) getVikingRankListByBossType(uid string, bossType int32) *pb.DBVikingRank {
-	ranks := make([]*pb.DBVikingRank, 0)
-	err := this.GetList(uid, &ranks)
-	if err != nil {
-		return nil
-	}
-	for _, v := range ranks {
-		if v.Bosstype == bossType {
-			return v
+	if db.IsCross() {
+		ranks := make([]*pb.DBVikingRank, 0)
+		err := this.GetList(uid, &ranks)
+		if err != nil {
+			return nil
+		}
+		for _, v := range ranks {
+			if v.Bosstype == bossType {
+				return v
+			}
+		}
+	} else {
+		conn, err := db.Cross()
+		if err != nil {
+			return nil
+		}
+		model := db.NewDBModel(comm.TableVikingRank, 0, conn)
+		ranks := make([]*pb.DBVikingRank, 0)
+		err = model.GetList(uid, &ranks)
+		if err != nil {
+			return nil
+		}
+		for _, v := range ranks {
+			if v.Bosstype == bossType {
+				return v
+			}
 		}
 	}
 	return nil
diff --git a/modules/viking/module.go b/modules/viking/module.go
index 2541f2552..b144567f4 100644
--- a/modules/viking/module.go
+++ b/modules/viking/module.go
@@ -77,7 +77,7 @@ func (this *Viking) Start() (err error) {
 
 func (this *Viking) CheckUserBaseVikingInfo(uid string) (data []*pb.DBVikingRank) {
 	list, err := this.modelViking.getVikingList(uid)
-	if err != nil {
+	if err == nil {
 		for k := range list.Boss {
 			_d := this.modulerank.getVikingRankListByBossType(uid, k)
 			if _d != nil {