From 601fac7a04877cd186753f23c35d72444b03cc45 Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Sat, 28 Jan 2023 18:46:42 +0800 Subject: [PATCH] 1 --- pkg/common/db/relation/group_model_k.go | 4 ++-- pkg/common/db/relation/init_mysql.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/common/db/relation/group_model_k.go b/pkg/common/db/relation/group_model_k.go index ae451addf..9e3827a7c 100644 --- a/pkg/common/db/relation/group_model_k.go +++ b/pkg/common/db/relation/group_model_k.go @@ -29,7 +29,7 @@ type Group struct { func NewGroupDB(db *gorm.DB) *Group { var group Group - group.DB = db.Model(&Group{}) + group.DB = db return &group } @@ -45,7 +45,7 @@ func (g *Group) Delete(ctx context.Context, groupIDs []string, tx ...*gorm.DB) ( defer func() { trace_log.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupIDs", groupIDs) }() - return utils.Wrap(getDBConn(g.DB, tx...).Where("group_id in (?)", groupIDs).Delete(&Group{}).Error, "") + return utils.Wrap(getDBConn(g.DB, tx).Where("group_id in (?)", groupIDs).Delete(&Group{}).Error, "") } func (g *Group) UpdateByMap(ctx context.Context, groupID string, args map[string]interface{}) (err error) { diff --git a/pkg/common/db/relation/init_mysql.go b/pkg/common/db/relation/init_mysql.go index b5439a9e6..1bc637760 100644 --- a/pkg/common/db/relation/init_mysql.go +++ b/pkg/common/db/relation/init_mysql.go @@ -87,7 +87,7 @@ func (w Writer) Printf(format string, args ...interface{}) { fmt.Printf(format, args...) } -func getDBConn(db *gorm.DB, tx ...*gorm.DB) *gorm.DB { +func getDBConn(db *gorm.DB, tx []*gorm.DB) *gorm.DB { if len(tx) > 0 { return tx[0] }