修正查询bug

code/makecode.go

@@ -1016,7 +1016,7 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 
 					if keywordTableStr != "" {
 						if keywordTableStr == v.GetString("name") {
-							keyword[table+"."+keywordTableStr+"[~]"] = keywordStr
+							data[table+"."+keywordTableStr+"[~]"] = keywordStr
 						}
 
 						if keywordTableStr == v.GetString("value") {
@@ -1026,7 +1026,7 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 								childIds = append(childIds, cv.GetString("id"))
 							}
 							if len(childIds) != 0 {
-								keyword[v.GetString("link")+".id"] = childIds
+								data[v.GetString("link")+".id"] = childIds
 							}
 						}
 						continue
@@ -1143,17 +1143,12 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 			data[k] = v
 		}
 	}
+
 	if len(keyword) > 1 {
-
-		if data["AND"] != nil {
-			and := data.GetMap("AND")
-			for k, v := range keyword {
-				and[k] = v
-			}
-
-			//data = Map{"AND":Map{"OR": keyword} data, }
+		if data["OR"] != nil {
+			data = Map{"AND": data, "OR": keyword}
 		} else {
-			data["AND"] = keyword
+			data["OR"] = keyword
 		}
 
 	}

dri/mongodb/mongodb.go

@@ -65,6 +65,32 @@ func (that *mongoDb) InsertMany(table string, data ...interface{}) Slice {
 
 }
 
+func (that *mongoDb) Update(table string, data Map, where Map) int64 {
+	collection := that.DataBase.Collection(table)
+	re, err := collection.UpdateMany(that.Ctx, where, data)
+
+	if err != nil {
+		that.LastErr = err
+		return 0
+	}
+
+	return re.ModifiedCount
+
+}
+
+func (that *mongoDb) Delete(table string, where Map) int64 {
+	collection := that.DataBase.Collection(table)
+	re, err := collection.DeleteMany(that.Ctx, where)
+
+	if err != nil {
+		that.LastErr = err
+		return 0
+	}
+
+	return re.DeletedCount
+
+}
+
 func (that *mongoDb) Get(table string, where Map) Map {
 	results := []Map{}
 	var cursor *mongo.Cursor
@@ -86,7 +112,11 @@ func (that *mongoDb) Get(table string, where Map) Map {
 		that.LastErr = err
 		return nil
 	}
-	return results[0]
+	if len(results) > 0 {
+
+		return results[0]
+	}
+	return nil
 }
 
 func (that mongoDb) Select(table string, where Map, page, pageRow int64) []Map {