From 208178f74c27d93ca570821e2777abd4690c8a19 Mon Sep 17 00:00:00 2001 From: wubin48435 Date: Tue, 30 Apr 2024 13:36:46 +0800 Subject: [PATCH] fix bug --- toolkit/gormgen/generator.go | 1 + toolkit/gormgen/internal/template/model.go | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/toolkit/gormgen/generator.go b/toolkit/gormgen/generator.go index 72caf4d6..0166a0f9 100644 --- a/toolkit/gormgen/generator.go +++ b/toolkit/gormgen/generator.go @@ -790,6 +790,7 @@ func (g *Generator) generateModelFile() error { funcMap["convert"] = func(s string) string { return strings.ReplaceAll(s, "time.Time", "customtypes.Time") } + funcMap["contains"] = strings.Contains t, err := template.New(tmpl.Model).Funcs(funcMap).Parse(tmpl.Model) if err != nil { errChan <- err diff --git a/toolkit/gormgen/internal/template/model.go b/toolkit/gormgen/internal/template/model.go index b2f8e7ec..593cdfc4 100644 --- a/toolkit/gormgen/internal/template/model.go +++ b/toolkit/gormgen/internal/template/model.go @@ -21,11 +21,15 @@ import ( {{if .TableName -}}var TableName{{.ModelStructName}} string{{- end}} func init() { + {{- if contains .TableName "." }} + TableName{{.ModelStructName}} = "{{.TableName}}" + {{- else }} if stringutils.IsNotEmpty(config.G_Config.Db.Name) { TableName{{.ModelStructName}} = fmt.Sprintf("%s.{{.TableName}}", config.G_Config.Db.Name) } else { TableName{{.ModelStructName}} = "{{.TableName}}" } + {{- end }} } // {{.ModelStructName}} {{.StructComment}}