v1.3.6: fix

mizuki1412 · Apr 1, 2022 · bf9d09f · bf9d09f
1 parent 4cb5471
commit bf9d09f
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 45 deletions.
diff --git a/goland-live-templates.md b/goland-live-templates.md
@@ -254,7 +254,11 @@ const (
 )
 
 func New(tx ...*sqlx.Tx) *Dao {
+	return NewWithSchema("", tx...)
+}
+func NewWithSchema(schema string,tx ...*sqlx.Tx) *Dao {
 	dao := &Dao{}
+	dao.SetSchema(schema)
 	if len(tx) > 0 {
 		dao.TX = tx[0]
 	}
@@ -266,11 +270,6 @@ func New(tx ...*sqlx.Tx) *Dao {
 	}
 	return dao
 }
-func NewWithSchema(schema string,tx ...*sqlx.Tx) *Dao {
-	dao := New(tx...)
-	dao.SetSchema(schema)
-	return dao
-}
 ```
 
 ## dao_new_no_cascade
@@ -280,17 +279,16 @@ type Dao struct {
 }
 
 func New(tx ...*sqlx.Tx) *Dao {
+	return NewWithSchema("", tx...)
+}
+func NewWithSchema(schema string,tx ...*sqlx.Tx) *Dao {
 	dao := &Dao{}
+	dao.SetSchema(schema)
 	if len(tx) > 0 {
 		dao.TX = tx[0]
 	}
 	return dao
 }
-func NewWithSchema(schema string,tx ...*sqlx.Tx) *Dao {
-	dao := New(tx...)
-	dao.SetSchema(schema)
-	return dao
-}
 ```
 
 ## dao_demo

diff --git a/mod/common/admindivision/dao/areadao/areadao.go b/mod/common/admindivision/dao/areadao/areadao.go
@@ -13,17 +13,16 @@ type Dao struct {
 }
 
 func New(tx ...*sqlx.Tx) *Dao {
+	return NewWithSchema("", tx...)
+}
+func NewWithSchema(schema string, tx ...*sqlx.Tx) *Dao {
 	dao := &Dao{}
+	dao.SetSchema(schema)
 	if len(tx) > 0 {
 		dao.TX = tx[0]
 	}
 	return dao
 }
-func NewWithSchema(schema string, tx ...*sqlx.Tx) *Dao {
-	dao := New(tx...)
-	dao.SetSchema(schema)
-	return dao
-}
 
 func (dao *Dao) FindById(id class.String) *model.Area {
 	sql, args := sqlkit.Builder().Select("code,name").From(dao.GetTableD("area")).Where("code=?", id).MustSql()

diff --git a/mod/common/admindivision/dao/citydao/citydao.go b/mod/common/admindivision/dao/citydao/citydao.go
@@ -13,17 +13,16 @@ type Dao struct {
 }
 
 func New(tx ...*sqlx.Tx) *Dao {
+	return NewWithSchema("", tx...)
+}
+func NewWithSchema(schema string, tx ...*sqlx.Tx) *Dao {
 	dao := &Dao{}
+	dao.SetSchema(schema)
 	if len(tx) > 0 {
 		dao.TX = tx[0]
 	}
 	return dao
 }
-func NewWithSchema(schema string, tx ...*sqlx.Tx) *Dao {
-	dao := New(tx...)
-	dao.SetSchema(schema)
-	return dao
-}
 
 func (dao *Dao) FindById(id class.String) *model.City {
 	sql, args := sqlkit.Builder().Select("*").From(dao.GetTableD("city")).Where("code=?", id).MustSql()

diff --git a/mod/common/admindivision/dao/provincedao/provincedao.go b/mod/common/admindivision/dao/provincedao/provincedao.go
@@ -19,7 +19,11 @@ const (
 )
 
 func New(tx ...*sqlx.Tx) *Dao {
+	return NewWithSchema("", tx...)
+}
+func NewWithSchema(schema string, tx ...*sqlx.Tx) *Dao {
 	dao := &Dao{}
+	dao.SetSchema(schema)
 	if len(tx) > 0 {
 		dao.TX = tx[0]
 	}
@@ -31,11 +35,6 @@ func New(tx ...*sqlx.Tx) *Dao {
 	}
 	return dao
 }
-func NewWithSchema(schema string, tx ...*sqlx.Tx) *Dao {
-	dao := New(tx...)
-	dao.SetSchema(schema)
-	return dao
-}
 
 func (dao *Dao) FindById(id class.String) *model.Province {
 	sql, args := sqlkit.Builder().Select("*").From(dao.GetTableD("province")).Where("code=?", id).MustSql()

diff --git a/mod/setting/dao/settingdao/settingdao.go b/mod/setting/dao/settingdao/settingdao.go
@@ -14,17 +14,16 @@ type Dao struct {
 }
 
 func New(tx ...*sqlx.Tx) *Dao {
+	return NewWithSchema("", tx...)
+}
+func NewWithSchema(schema string, tx ...*sqlx.Tx) *Dao {
 	dao := &Dao{}
+	dao.SetSchema(schema)
 	if len(tx) > 0 {
 		dao.TX = tx[0]
 	}
 	return dao
 }
-func NewWithSchema(schema string, tx ...*sqlx.Tx) *Dao {
-	dao := New(tx...)
-	dao.SetSchema(schema)
-	return dao
-}
 
 func (dao *Dao) Set(data map[string]interface{}) {
 	sql, args, err := sqlkit.Builder().Update(dao.GetTableD("more_setting")).Set("data", jsonkit.ToString(data)).Where("id=?", 1).ToSql()

diff --git a/mod/user/dao/departmentdao/departmentdao.go b/mod/user/dao/departmentdao/departmentdao.go
@@ -18,7 +18,11 @@ const (
 )
 
 func New(tx ...*sqlx.Tx) *Dao {
+	return NewWithSchema("", tx...)
+}
+func NewWithSchema(schema string, tx ...*sqlx.Tx) *Dao {
 	dao := &Dao{}
+	dao.SetSchema(schema)
 	if len(tx) > 0 {
 		dao.TX = tx[0]
 	}
@@ -42,11 +46,6 @@ func New(tx ...*sqlx.Tx) *Dao {
 	}
 	return dao
 }
-func NewWithSchema(schema string, tx ...*sqlx.Tx) *Dao {
-	dao := New(tx...)
-	dao.SetSchema(schema)
-	return dao
-}
 
 func (dao *Dao) FindById(id int32) *model.Department {
 	sql, args := sqlkit.Builder().Select("*").From(dao.GetTableD("department")).Where("id=?", id).MustSql()

diff --git a/mod/user/dao/roledao/roledao.go b/mod/user/dao/roledao/roledao.go
@@ -20,7 +20,11 @@ const (
 )
 
 func New(tx ...*sqlx.Tx) *Dao {
+	return NewWithSchema("", tx...)
+}
+func NewWithSchema(schema string, tx ...*sqlx.Tx) *Dao {
 	dao := &Dao{}
+	dao.SetSchema(schema)
 	if len(tx) > 0 {
 		dao.TX = tx[0]
 	}
@@ -36,11 +40,6 @@ func New(tx ...*sqlx.Tx) *Dao {
 	}
 	return dao
 }
-func NewWithSchema(schema string, tx ...*sqlx.Tx) *Dao {
-	dao := New(tx...)
-	dao.SetSchema(schema)
-	return dao
-}
 func (dao *Dao) scanPrivilege(sql string, args []any) []*model.PrivilegeConstant {
 	rows := dao.Query(sql, args...)
 	list := make([]*model.PrivilegeConstant, 0, 5)

diff --git a/mod/user/dao/userdao/userdao.go b/mod/user/dao/userdao/userdao.go
@@ -24,7 +24,11 @@ const (
 )
 
 func New(tx ...*sqlx.Tx) *Dao {
+	return NewWithSchema("", tx...)
+}
+func NewWithSchema(schema string, tx ...*sqlx.Tx) *Dao {
 	dao := &Dao{}
+	dao.SetSchema(schema)
 	if len(tx) > 0 {
 		dao.TX = tx[0]
 	}
@@ -44,11 +48,6 @@ func New(tx ...*sqlx.Tx) *Dao {
 	}
 	return dao
 }
-func NewWithSchema(schema string, tx ...*sqlx.Tx) *Dao {
-	dao := New(tx...)
-	dao.SetSchema(schema)
-	return dao
-}
 
 func (dao *Dao) Login(pwd, username, phone string) *model.User {
 	builder := sqlkit.Builder().Select("*").From(dao.GetTableD("admin_user"))