From 6a553f11e8323af317bdab963e47756f2e57694f Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Thu, 22 Dec 2022 23:56:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=85=83=E7=B4=A0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/sociaty/model_sociaty.go | 17 ++++++++++-------
 modules/task/model_active.go     |  5 +++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/modules/sociaty/model_sociaty.go b/modules/sociaty/model_sociaty.go
index 4dc4b8323..d445f577e 100644
--- a/modules/sociaty/model_sociaty.go
+++ b/modules/sociaty/model_sociaty.go
@@ -352,9 +352,10 @@ func (this *ModelSociaty) updateSociaty(sociatyId string, update map[string]inte
 
 // 退出公会
 func (this *ModelSociaty) quit(uid string, sociaty *pb.DBSociaty) error {
-	for i, m := range sociaty.Members {
-		if m.Uid == uid {
+	for i:=0;i<len(sociaty.Members);i++{
+		if sociaty.Members[i].Uid == uid {
 			sociaty.Members = append(sociaty.Members[:i], sociaty.Members[i+1:]...)
+			i--
 		}
 	}
 	update := map[string]interface{}{
@@ -385,9 +386,10 @@ func (this *ModelSociaty) dismiss(sociaty *pb.DBSociaty) error {
 
 //删除请求记录
 func (this *ModelSociaty) delFromApplyRecord(uid string, sociaty *pb.DBSociaty) error {
-	for i, ar := range sociaty.ApplyRecord {
-		if ar.Uid == uid {
+	for i:=0;i<len(sociaty.ApplyRecord);i++{
+		if sociaty.ApplyRecord[i].Uid == uid {
 			sociaty.ApplyRecord = append(sociaty.ApplyRecord[:i], sociaty.ApplyRecord[i+1:]...)
+			i--
 		}
 	}
 	update := map[string]interface{}{
@@ -511,12 +513,13 @@ func (this *ModelSociaty) assign(srcId, targetId string, sociaty *pb.DBSociaty)
 // targetId 踢出目标
 // 不允许踢出会长
 func (this *ModelSociaty) discharge(targetId string, sociaty *pb.DBSociaty) error {
-	for i, m := range sociaty.Members {
-		if m.Uid == targetId {
-			if m.Job == pb.SociatyJob_PRESIDENT {
+	for i:=0;i<len(sociaty.Members);i++ {
+		if sociaty.Members[i].Uid == targetId {
+			if sociaty.Members[i].Job == pb.SociatyJob_PRESIDENT {
 				return comm.NewCustomError(pb.ErrorCode_SociatyMasterNoDiss)
 			}
 			sociaty.Members = append(sociaty.Members[:i], sociaty.Members[i+1:]...)
+			i--
 		}
 	}
 	update := map[string]interface{}{
diff --git a/modules/task/model_active.go b/modules/task/model_active.go
index 2b11bb3fe..acb79dec4 100644
--- a/modules/task/model_active.go
+++ b/modules/task/model_active.go
@@ -130,9 +130,10 @@ func (this *ModelTaskActive) clearTask(uid string, taskTag ...comm.TaskTag) {
 		return
 	}
 	data := this.getActiveListByTag(uid, taskTag[0])
-	for i, v := range data {
-		if v.Tag == int32(taskTag[0]) {
+	for i:=0; i<len(data); i++ {
+		if data[i].Tag == int32(taskTag[0]) {
 			data = append(data[:i], data[i+1:]...)
+			i--
 		}
 	}
 	update := map[string]interface{}{

From 59b0671c2662c9e0166cee493bcddff4bfd84172 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Fri, 23 Dec 2022 10:00:51 +0800
Subject: [PATCH 2/2] update

---
 modules/hunting/model_hunting.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/hunting/model_hunting.go b/modules/hunting/model_hunting.go
index b25d35e93..f610a87ed 100644
--- a/modules/hunting/model_hunting.go
+++ b/modules/hunting/model_hunting.go
@@ -3,7 +3,6 @@ package hunting
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/core"
-	"go_dreamfactory/lego/sys/mgo"
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
 
@@ -34,7 +33,7 @@ func (this *modelHunting) modifyHuntingDataByObjId(uid string, data map[string]i
 // 获取列表信息
 func (this *modelHunting) getHuntingList(uid string) (result *pb.DBHunting, err error) {
 	result = &pb.DBHunting{}
-	if err = this.Get(uid, result); err != nil && mgo.MongodbNil != err {
+	if err = this.Get(uid, result); err != nil {
 		return
 	}