From ced15fa9171327163fa55898c019e6fe8383f24a Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 11 Sep 2023 16:56:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/smithy/model_atlas.go   | 15 +++++++++++++--
 modules/viking/api_challenge.go | 12 ++++++++++--
 modules/viking/api_getlist.go   | 10 ++++++++--
 modules/viking/model_viking.go  |  1 -
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/modules/smithy/model_atlas.go b/modules/smithy/model_atlas.go
index a9dfc4ea7..5d6277c3c 100644
--- a/modules/smithy/model_atlas.go
+++ b/modules/smithy/model_atlas.go
@@ -83,7 +83,9 @@ func (this *modelAtlas) CheckActivateEquipAtlas(uid string, Equip []*pb.DB_Equip
 				}
 			}
 			if list == nil {
-				list, _ = this.module.modelAtlas.getSmithyAtlasList(uid)
+				if list, err = this.module.modelAtlas.getSmithyAtlasList(uid); err != nil {
+					return false
+				}
 			}
 
 			if atlasConf.TypeId == 1 { // 装备收藏图鉴信息
@@ -146,7 +148,13 @@ func (this *modelAtlas) CheckActivateEquipAtlas(uid string, Equip []*pb.DB_Equip
 
 // 红点检测
 func (this *modelAtlas) checkReddot17102(uid string) bool {
-	list, _ := this.module.modelAtlas.getSmithyAtlasList(uid)
+	var (
+		list *pb.DBAtlas
+		err  error
+	)
+	if list, err = this.module.modelAtlas.getSmithyAtlasList(uid); err != nil {
+		return false
+	}
 	for _, v := range list.Atlas {
 		if v.Activate == false {
 			return true
@@ -157,6 +165,9 @@ func (this *modelAtlas) checkReddot17102(uid string) bool {
 		}
 	}
 	listCollect, _ := this.module.modelAtlas.getSmithyAtlasList(uid)
+	if err != nil {
+		return false
+	}
 	for _, v := range listCollect.Collect {
 		if v.Activate == false {
 			return true
diff --git a/modules/viking/api_challenge.go b/modules/viking/api_challenge.go
index ae6183653..efe42e4d9 100644
--- a/modules/viking/api_challenge.go
+++ b/modules/viking/api_challenge.go
@@ -21,12 +21,20 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.VikingCha
 // /挑战主线关卡
 func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChallengeReq) (errdata *pb.ErrorData) {
 	var (
-		ps int32
+		ps     int32
+		viking *pb.DBViking
+		err    error
 	)
 	if errdata = this.ChallengeCheck(session, req); errdata != nil {
 		return // 参数校验失败直接返回
 	}
-	viking, _ := this.module.modelViking.getVikingList(session.GetUserId())
+	if viking, err = this.module.modelViking.getVikingList(session.GetUserId()); err != nil {
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_DBError,
+			Title: pb.ErrorCode_DBError.ToString(),
+		}
+		return
+	}
 
 	cfgData, err := this.module.configure.GetVikingBossConfigData(req.BossId, req.Difficulty)
 	if err != nil {
diff --git a/modules/viking/api_getlist.go b/modules/viking/api_getlist.go
index af8579b53..3be068f1a 100644
--- a/modules/viking/api_getlist.go
+++ b/modules/viking/api_getlist.go
@@ -16,8 +16,14 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.VikingGetListReq
 		return // 参数校验失败直接返回
 	}
 
-	list, _ := this.module.modelViking.getVikingList(session.GetUserId())
-
+	list, err := this.module.modelViking.getVikingList(session.GetUserId())
+	if err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.ToString(),
+			Message: err.Error(),
+		}
+	}
 	session.SendMsg(string(this.module.GetType()), VikingGetListResp, &pb.VikingGetListResp{Data: list})
 	return
 }
diff --git a/modules/viking/model_viking.go b/modules/viking/model_viking.go
index fe2e0adfd..cfca8ed7b 100644
--- a/modules/viking/model_viking.go
+++ b/modules/viking/model_viking.go
@@ -45,7 +45,6 @@ func (this *modelViking) getVikingList(uid string) (result *pb.DBViking, err err
 		}
 		return
 	}
-	err = nil
 	return result, err
 }