From 74f5d0328feabad742a6279e71defd4f48c0d0e6 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Fri, 26 May 2023 09:31:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=BB=E5=8A=A1=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/rtask/module.go | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/modules/rtask/module.go b/modules/rtask/module.go
index 7cd78146c..f359f187c 100644
--- a/modules/rtask/module.go
+++ b/modules/rtask/module.go
@@ -80,7 +80,8 @@ func (this *ModuleRtask) getHandle(tt comm.TaskType) (handles []*rtaskCondHandle
 	for _, v := range this.configure.getRtaskCondis(int32(tt)) {
 		switch tt {
 		// 两个参数 大于1个参数且第一个参数累计，第二个参数等于
-		case comm.Rtype1, comm.Rtype16, comm.Rtype17, comm.Rtype50, comm.Rtype125, comm.Rtype126, comm.Rtype127, comm.Rtype187:
+		case comm.Rtype1, comm.Rtype16, comm.Rtype17, comm.Rtype50, comm.Rtype51,
+			comm.Rtype125, comm.Rtype126, comm.Rtype127, comm.Rtype187:
 			handle := &rtaskCondHandle{
 				condId: v.Id,
 				verify: this.modelRtaskRecord.verifyMultiEqual,
@@ -122,7 +123,7 @@ func (this *ModuleRtask) getHandle(tt comm.TaskType) (handles []*rtaskCondHandle
 			comm.Rtype12, comm.Rtype13, comm.Rtype14, comm.Rtype15, comm.Rtype18, comm.Rtype19,
 			comm.Rtype23, comm.Rtype24, comm.Rtype26, comm.Rtype27, comm.Rtype28, comm.Rtype38, comm.Rtype39,
 			comm.Rtype47,
-			comm.Rtype51, comm.Rtype53, comm.Rtype54, comm.Rtype57,
+			comm.Rtype53, comm.Rtype54, comm.Rtype57,
 			comm.Rtype60, comm.Rtype62, comm.Rtype64, comm.Rtype87, comm.Rtype88, comm.Rtype89,
 			comm.Rtype90, comm.Rtype91, comm.Rtype92, comm.Rtype94, comm.Rtype95, comm.Rtype97, comm.Rtype96, comm.Rtype98, comm.Rtype99,
 			comm.Rtype104, comm.Rtype102, comm.Rtype103, comm.Rtype105, comm.Rtype106, comm.Rtype108,
@@ -363,20 +364,20 @@ func (this *ModuleRtask) processTasks(session comm.IUserSession, taskParams ...*
 			// 	if user, ok := userModule.(comm.IUser); ok {
 			// 		ex, err := user.GetUserExpand(uid)
 			// 		if err == nil && ex.SociatyId != "" {
-						sociatyModule, err := this.service.GetModule(comm.ModuleSociaty)
-						if err != nil {
-							return
-						}
-						if sociaty, ok := sociatyModule.(comm.ISociaty); ok {
-							if err2 := sociaty.TaskcondNotify(uid, condId); err2 != nil {
-			// 					log.Error("公会任务条件达成通知",
-			// 						log.Field{Key: "uid", Value: uid},
-			// 						log.Field{Key: "sociatyId", Value: ex.SociatyId},
-			// 						log.Field{Key: "condId", Value: condId},
-			// 						log.Field{Key: "err", Value: err2.Error()},
-			// 					)
-							}
-						}
+			sociatyModule, err := this.service.GetModule(comm.ModuleSociaty)
+			if err != nil {
+				return
+			}
+			if sociaty, ok := sociatyModule.(comm.ISociaty); ok {
+				if err2 := sociaty.TaskcondNotify(uid, condId); err2 != nil {
+					// 					log.Error("公会任务条件达成通知",
+					// 						log.Field{Key: "uid", Value: uid},
+					// 						log.Field{Key: "sociatyId", Value: ex.SociatyId},
+					// 						log.Field{Key: "condId", Value: condId},
+					// 						log.Field{Key: "err", Value: err2.Error()},
+					// 					)
+				}
+			}
 			// 		}
 			// 	}
 			// }