From 0b5df45a029f328b9094968356bfafe5e59e7655 Mon Sep 17 00:00:00 2001
From: mr <mr>
Date: Fri, 2 Aug 2024 17:38:51 +0200
Subject: [PATCH] exec access

---
 dbs/mongo/mongo.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dbs/mongo/mongo.go b/dbs/mongo/mongo.go
index 7e0c080..afe42e4 100644
--- a/dbs/mongo/mongo.go
+++ b/dbs/mongo/mongo.go
@@ -279,10 +279,11 @@ func (m *MongoDB) Search(filters *dbs.Filters, collection_name string) (*mongo.C
 		}
 		if len(orList) > 0 && len(andList) == 0 {
 			f = bson.D{{"$or", orList}}
-		} else if len(orList) == 0 && len(andList) > 0 {
+		} else {
+			if len(orList) > 0 {
+				andList = append(andList, bson.M{"$or": orList})
+			}
 			f = bson.D{{"$and", andList}}
-		} else if len(orList) > 0 && len(andList) > 0 {
-			f = bson.D{{"$and", andList}, {"$or", orList}}
 		}
 	}