fix bug

unionj-cloud · Apr 30, 2024 · 208178f · 208178f
1 parent 4829735
commit 208178f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git 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
@@ -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}}