数据库操作bug

2022-08-31 11:20:58 +08:00
1 changed files with 3 additions and 12 deletions
@@ -165,11 +165,8 @@ func (that *HotimeDBBuilder) And(qu ...interface{}) *HotimeDBBuilder {
 	}

 	if that.lastWhere != nil {
-		if that.lastWhere["AND"] != nil {
-			where["AND"] = that.lastWhere["AND"]
-		}
 		that.lastWhere["AND"] = where
-		//that.lastWhere = where
+		that.lastWhere = where
 		return that
 	}
 	that.lastWhere = where
@@ -199,11 +196,8 @@ func (that *HotimeDBBuilder) Or(qu ...interface{}) *HotimeDBBuilder {
 	}

 	if that.lastWhere != nil {
-		if that.lastWhere["OR"] != nil {
-			where["OR"] = that.lastWhere["OR"]
-		}
 		that.lastWhere["OR"] = where
-		//that.lastWhere = where
+		that.lastWhere = where
 		return that
 	}
 	that.lastWhere = where
@@ -234,11 +228,8 @@ func (that *HotimeDBBuilder) Where(qu ...interface{}) *HotimeDBBuilder {
 	}

 	if that.lastWhere != nil {
-		if that.lastWhere["AND"] != nil {
-			where["AND"] = that.lastWhere["AND"]
-		}
 		that.lastWhere["AND"] = where
-		//that.lastWhere = where
+		that.lastWhere = where
 		return that
 	}
 	that.lastWhere = where