From c38961e908cba003ce3d086d3912acc1e55ac28c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Fri, 28 Nov 2025 17:13:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Mongo=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=BB=93=E6=9E=84=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 http/http.go   |  3 +--
 mongo/mongo.go | 28 ++++++++++++++++++++++++----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/http/http.go b/http/http.go
index 757ae57..2b95a47 100644
--- a/http/http.go
+++ b/http/http.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	_ "gitee.com/red-future---jilin-g/common/consul"
 	"gitee.com/red-future---jilin-g/common/jaeger"
-	"gitee.com/red-future---jilin-g/common/middleware"
 	"gitee.com/red-future---jilin-g/common/utils"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
@@ -50,7 +49,7 @@ func RouteRegister(controllers []interface{}) {
 			return fmt.Sprintf("/%s", strings.ToLower(s))
 		})
 		Httpserver.Group(convertedStr, func(group *ghttp.RouterGroup) {
-			group.Middleware(middleware.Limiter, jaeger.NewTracer)
+			group.Middleware(jaeger.NewTracer)
 			group.Bind(t)
 		})
 	}
diff --git a/mongo/mongo.go b/mongo/mongo.go
index 380fbad..3bfa69a 100644
--- a/mongo/mongo.go
+++ b/mongo/mongo.go
@@ -40,6 +40,7 @@ func Find(ctx context.Context, filter bson.M, result interface{}, collection str
 	if err = utils.ValidStructPtr(result); err != nil {
 		return
 	}
+	//filter["isDeleted"] = 0
 	cur, err := db.Collection(collection).Find(ctx, filter, opts...)
 	if err != nil {
 		return
@@ -50,13 +51,14 @@ func Find(ctx context.Context, filter bson.M, result interface{}, collection str
 
 // FindOne 查询1条记录
 func FindOne(ctx context.Context, filter bson.M, result interface{}, collection string, opts ...options.Lister[options.FindOneOptions]) (err error) {
-	if len(filter) == 0 {
-		err = gerror.New("缺少查询条件")
-		return
-	}
+	//if len(filter) == 0 {
+	//	err = gerror.New("缺少查询条件")
+	//	return
+	//}
 	if err = utils.ValidStructPtr(result); err != nil {
 		return
 	}
+	//filter["isDeleted"] = 0
 	cur := db.Collection(collection).FindOne(ctx, filter, opts...)
 	err = cur.Decode(result)
 	if err == mongo.ErrNoDocuments {
@@ -67,6 +69,11 @@ func FindOne(ctx context.Context, filter bson.M, result interface{}, collection
 
 // Delete 删除记录
 func Delete(ctx context.Context, filter bson.M, collection string, opts ...options.Lister[options.DeleteManyOptions]) (count int64, err error) {
+	if len(filter) == 0 {
+		err = gerror.New("缺少查询条件")
+		return
+	}
+	//filter["isDeleted"] = 0
 	r, err := db.Collection(collection).DeleteMany(ctx, filter, opts...)
 	if err != nil {
 		return
@@ -77,6 +84,11 @@ func Delete(ctx context.Context, filter bson.M, collection string, opts ...optio
 
 // Update 修改记录
 func Update(ctx context.Context, filter bson.M, update interface{}, collection string, opts ...options.Lister[options.UpdateManyOptions]) (result *mongo.UpdateResult, err error) {
+	if len(filter) == 0 {
+		err = gerror.New("缺少查询条件")
+		return
+	}
+	//filter["isDeleted"] = 0
 	result, err = db.Collection(collection).UpdateMany(ctx, filter, update, opts...)
 	if err != nil {
 		return
@@ -86,6 +98,9 @@ func Update(ctx context.Context, filter bson.M, update interface{}, collection s
 
 // Insert 插入多条记录
 func Insert(ctx context.Context, documents []interface{}, collection string, opts ...options.Lister[options.InsertManyOptions]) (ids []interface{}, err error) {
+	//for _, document := range documents {
+	//	gconv.Map(document)["isDeleted"] = 0
+	//}
 	r, err := db.Collection(collection).InsertMany(ctx, documents, opts...)
 	if err != nil {
 		return
@@ -96,6 +111,11 @@ func Insert(ctx context.Context, documents []interface{}, collection string, opt
 
 // Count  查询总数
 func Count(ctx context.Context, filter bson.M, collection string) (count int64, err error) {
+	//if len(filter) == 0 {
+	//	err = gerror.New("缺少查询条件")
+	//	return
+	//}
+	//filter["isDeleted"] = 0
 	// 调用驱动的 CountDocuments，在数据库端执行的
 	count, err = db.Collection(collection).CountDocuments(ctx, filter)
 	return