From 5db50ef2f28df6488fb762c73e0cf082739cdd1c Mon Sep 17 00:00:00 2001
From: John <john@johng.cn>
Date: Mon, 7 May 2018 16:22:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgdb.Model.And/Or=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 g/database/gdb/gdb_base.go  | 2 ++
 g/database/gdb/gdb_model.go | 4 ++--
 geg/database/mysql/mysql.go | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/g/database/gdb/gdb_base.go b/g/database/gdb/gdb_base.go
index 27a582b9e..fc1b7e700 100644
--- a/g/database/gdb/gdb_base.go
+++ b/g/database/gdb/gdb_base.go
@@ -38,6 +38,8 @@ func (db *Db) Close() error {
 
 // 数据库sql查询操作，主要执行查询
 func (db *Db) Query(query string, args ...interface{}) (*sql.Rows, error) {
+    fmt.Println(query)
+    fmt.Println(args)
     p         := db.link.handleSqlBeforeExec(&query)
     rows, err := db.slave.Query(*p, args ...)
     err        = db.formatError(err, p, args...)
diff --git a/g/database/gdb/gdb_model.go b/g/database/gdb/gdb_model.go
index 8a85f4e27..8bfd9a480 100644
--- a/g/database/gdb/gdb_model.go
+++ b/g/database/gdb/gdb_model.go
@@ -91,14 +91,14 @@ func (md *Model) Where(where interface{}, args...interface{}) (*Model) {
 // 链式操作，添加AND条件到Where中
 func (md *Model) And(where interface{}, args...interface{}) (*Model) {
     md.where     += " AND " + md.db.formatCondition(where)
-    md.whereArgs  = append(md.whereArgs, args)
+    md.whereArgs  = append(md.whereArgs, args...)
     return md
 }
 
 // 链式操作，添加OR条件到Where中
 func (md *Model) Or(where interface{}, args...interface{}) (*Model) {
     md.where     += " OR " + md.db.formatCondition(where)
-    md.whereArgs  = append(md.whereArgs, args)
+    md.whereArgs  = append(md.whereArgs, args...)
     return md
 }
 
diff --git a/geg/database/mysql/mysql.go b/geg/database/mysql/mysql.go
index 4ddc0f759..afff92934 100644
--- a/geg/database/mysql/mysql.go
+++ b/geg/database/mysql/mysql.go
@@ -478,7 +478,7 @@ func mapToStruct() {
 }
 
 func main() {
-    r, _ := db.Table("user").Fields("*").Where("typeid = ?", 1).Limit(0, 10).Select()
+    r, _ := db.Table("user").Fields("*").Where("typeid = ?", 1).And("uid=?", 1).Limit(0, 10).Select()
     j, _ := gparser.VarToJson(r.ToList())
     fmt.Println(string(j))
     fmt.Println(r)