From 0e2a3e45536e6f984a7be63959b002a2300e8a97 Mon Sep 17 00:00:00 2001
From: xxj <346944475@qq.com>
Date: Fri, 19 Feb 2021 18:03:04 +0800
Subject: [PATCH] colname add ``
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

给导出列名添加``符
---
 data/view/genfunc/def.go  | 8 ++++----
 data/view/model/common.go | 2 +-
 data/view/model/def.go    | 1 +
 data/view/model/model.go  | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/data/view/genfunc/def.go b/data/view/genfunc/def.go
index 5c5d089..ffed494 100644
--- a/data/view/genfunc/def.go
+++ b/data/view/genfunc/def.go
@@ -148,7 +148,7 @@ func (obj *_{{$obj.StructName}}Mgr) Gets() (results []*{{$obj.StructName}}, err
 {{range $oem := $obj.Em}}
 // With{{$oem.ColStructName}} {{$oem.ColName}}获取 {{$oem.Notes}}
 func (obj *_{{$obj.StructName}}Mgr) With{{$oem.ColStructName}}({{CapLowercase $oem.ColStructName}} {{$oem.Type}}) Option {
-	return optionFunc(func(o *options) { o.query["{{$oem.ColName}}"] = {{CapLowercase $oem.ColStructName}} })
+	return optionFunc(func(o *options) { o.query["{{$oem.ColNameEx}}"] = {{CapLowercase $oem.ColStructName}} })
 }
 {{end}}
 
@@ -184,20 +184,20 @@ func (obj *_{{$obj.StructName}}Mgr) GetByOptions(opts ...Option) (results []*{{$
 {{range $oem := $obj.Em}}
 // GetFrom{{$oem.ColStructName}} 通过{{$oem.ColName}}获取内容 {{$oem.Notes}} {{if $oem.IsMulti}}
 func (obj *_{{$obj.StructName}}Mgr) GetFrom{{$oem.ColStructName}}({{CapLowercase $oem.ColStructName}} {{$oem.Type}}) (results []*{{$obj.StructName}}, err error) {
-	err = obj.DB.WithContext(obj.ctx).Table(obj.GetTableName()).Where("{{$oem.ColName}} = ?", {{CapLowercase $oem.ColStructName}}).Find(&results).Error
+	err = obj.DB.WithContext(obj.ctx).Table(obj.GetTableName()).Where("{{$oem.ColNameEx}} = ?", {{CapLowercase $oem.ColStructName}}).Find(&results).Error
 	{{GenPreloadList $obj.PreloadList true}}
 	return
 }
 {{else}}
 func (obj *_{{$obj.StructName}}Mgr)  GetFrom{{$oem.ColStructName}}({{CapLowercase $oem.ColStructName}} {{$oem.Type}}) (result {{$obj.StructName}}, err error) {
-	err = obj.DB.WithContext(obj.ctx).Table(obj.GetTableName()).Where("{{$oem.ColName}} = ?", {{CapLowercase $oem.ColStructName}}).Find(&result).Error
+	err = obj.DB.WithContext(obj.ctx).Table(obj.GetTableName()).Where("{{$oem.ColNameEx}} = ?", {{CapLowercase $oem.ColStructName}}).Find(&result).Error
 	{{GenPreloadList $obj.PreloadList false}}
 	return
 }
 {{end}}
 // GetBatchFrom{{$oem.ColStructName}} 批量唯一主键查找 {{$oem.Notes}}
 func (obj *_{{$obj.StructName}}Mgr) GetBatchFrom{{$oem.ColStructName}}({{CapLowercase $oem.ColStructName}}s []{{$oem.Type}}) (results []*{{$obj.StructName}}, err error) {
-	err = obj.DB.WithContext(obj.ctx).Table(obj.GetTableName()).Where("{{$oem.ColName}} IN (?)", {{CapLowercase $oem.ColStructName}}s).Find(&results).Error
+	err = obj.DB.WithContext(obj.ctx).Table(obj.GetTableName()).Where("{{$oem.ColNameEx}} IN (?)", {{CapLowercase $oem.ColStructName}}s).Find(&results).Error
 	{{GenPreloadList $obj.PreloadList true}}
 	return
 }
diff --git a/data/view/model/common.go b/data/view/model/common.go
index d2294ff..812d99c 100644
--- a/data/view/model/common.go
+++ b/data/view/model/common.go
@@ -189,7 +189,7 @@ func GenFListIndex(info FList, status int) string {
 		{
 			var strs []string
 			for _, v := range info.Kem {
-				strs = append(strs, fmt.Sprintf("%v = ?", v.ColName))
+				strs = append(strs, fmt.Sprintf("`%v` = ?", v.ColName))
 			}
 			return strings.Join(strs, " AND ")
 		}
diff --git a/data/view/model/def.go b/data/view/model/def.go
index c92f505..d5f1ca2 100644
--- a/data/view/model/def.go
+++ b/data/view/model/def.go
@@ -106,6 +106,7 @@ type EmInfo struct {
 	Notes         string // 注释
 	Type          string // 类型
 	ColName       string // 列名
+	ColNameEx     string // `列名`
 	ColStructName string // 列结构体
 }
 
diff --git a/data/view/model/model.go b/data/view/model/model.go
index 0b7b6bf..3e1f187 100644
--- a/data/view/model/model.go
+++ b/data/view/model/model.go
@@ -297,6 +297,7 @@ func (m *_Model) generateFunc() (genOut []GenOutInfo) {
 					Notes:         fixNotes(el.Notes),
 					Type:          typeName, // Type.类型标记
 					ColName:       el.Name,
+					ColNameEx:     fmt.Sprintf("`%v`", el.Name),
 					ColStructName: getCamelName(el.Name),
 				})
 				if v2, ok := cnf.EImportsHead[typeName]; ok {