diff --git a/db/hotimedb.go b/db/hotimedb.go index b004d89..71cdcd3 100644 --- a/db/hotimedb.go +++ b/db/hotimedb.go @@ -165,8 +165,11 @@ 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 @@ -196,8 +199,11 @@ 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 @@ -228,8 +234,11 @@ 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