From 67a019dccf9cf37bb14624580e7dd095eb8b4f9e Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Fri, 8 Dec 2023 21:11:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=94=99=E8=AF=AF=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/activity/module.go   | 10 ++++++----
 modules/tools/modelGlobal.go |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/activity/module.go b/modules/activity/module.go
index 06108cd8f..2dc12bdd4 100644
--- a/modules/activity/module.go
+++ b/modules/activity/module.go
@@ -297,10 +297,12 @@ func (this *Activity) GetHdData(session comm.IUserSession, oids []string) (resul
 	)
 	curTime := configure.Now().Unix()
 
-	if activity, err = this.GetHdInfoByItype(pb.HdType_HdCelebration); err == nil {
-		if activity.Stime > curTime || curTime > activity.Etime { // 不在活动范围内数据不给活动记录数据
-			return
-		}
+	if activity, err = this.GetHdInfoByItype(pb.HdType_HdCelebration); err != nil {
+		this.Errorln(err)
+		return
+	}
+	if activity.Stime > curTime || curTime > activity.Etime { // 不在活动范围内数据不给活动记录数据
+		return
 	}
 	id := activity.Id
 	list, _ = this.modelhdData.getHddataByOid(session.GetUserId(), id)
diff --git a/modules/tools/modelGlobal.go b/modules/tools/modelGlobal.go
index 902b49c7f..83e1abcd2 100644
--- a/modules/tools/modelGlobal.go
+++ b/modules/tools/modelGlobal.go
@@ -34,7 +34,7 @@ func (this *modelGlobal) GetGlobalData(key string, v interface{}) (err error) {
 // 更新全局配置
 func (this *modelGlobal) UpdateGlobalData(key string, v interface{}) (err error) {
 	if _, err = this.DBModel.DB.UpdateOne(core.SqlTable(this.TableName), bson.M{"_id": key}, bson.M{"$set": v}, options.Update().SetUpsert(true)); err != nil {
-		this.module.Error("GetGlobalData err", log.Field{Key: "key", Value: key}, log.Field{Key: "err", Value: err.Error()})
+		//this.module.Error("GetGlobalData err", log.Field{Key: "key", Value: key}, log.Field{Key: "err", Value: err.Error()})
 	}
 	return
 }