diff --git a/models/dictData.go b/models/dictData.go index e07337d..b945eb3 100644 --- a/models/dictData.go +++ b/models/dictData.go @@ -139,4 +139,3 @@ func (e *DictData) BatchDelete(id []int) (Result bool, err error) { Result = true return } - diff --git a/template/js.go.template b/template/js.go.template index 9c7ca82..efa51fe 100644 --- a/template/js.go.template +++ b/template/js.go.template @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 查询参数列表 +// 查询{{.ClassName}}列表 export function list{{.ClassName}}(query) { return request({ url: '/api/v1/{{.ModuleName}}List', @@ -9,7 +9,7 @@ params: query }) } -// 查询参数详细 +// 查询{{.ClassName}}详细 export function get{{.ClassName}} ({{.PkJsonField}}) { return request({ url: '/api/v1/{{.ModuleName}}/' + {{.PkJsonField}}, @@ -18,7 +18,7 @@ method: 'get' } -// 新增参数配置 +// 新增{{.ClassName}} export function add{{.ClassName}}(data) { return request({ url: '/api/v1/{{.ModuleName}}', @@ -27,7 +27,7 @@ data: data }) } -// 修改参数配置 +// 修改{{.ClassName}} export function update{{.ClassName}}(data) { return request({ url: '/api/v1/{{.ModuleName}}', @@ -36,7 +36,7 @@ data: data }) } -// 删除参数配置 +// 删除{{.ClassName}} export function del{{.ClassName}}({{.PkJsonField}}) { return request({ url: '/api/v1/{{.ModuleName}}/' + {{.PkJsonField}}, diff --git a/template/model.go.template b/template/model.go.template index c5541d1..fa0320e 100644 --- a/template/model.go.template +++ b/template/model.go.template @@ -35,22 +35,21 @@ func (e *{{.ClassName}}) Create() ({{.ClassName}}, error) { // 获取{{.ClassName}} func (e *{{.ClassName}}) Get() ({{.ClassName}}, error) { - var doc {{.ClassName}} - +var doc {{.ClassName}} table := orm.Eloquent.Table(e.TableName()) {{ range .Columns -}} {{$z := .IsQuery}} {{- if ($z) -}} - if e.{{.GoField}} != "" { + if e.{{.GoField}} != "" { table = table.Where("{{.ColumnName}} = ?", e.{{.GoField}}) - } + } {{ end -}} - {{ end }} +{{ end }} - if err := table.First(&doc).Error; err != nil { - return doc, err - } - return doc, nil +if err := table.First(&doc).Error; err != nil { +return doc, err +} +return doc, nil } // 获取{{.ClassName}}带分页 @@ -61,9 +60,9 @@ func (e *{{.ClassName}}) GetPage(pageSize int, pageIndex int) ([]{{.ClassName}}, {{ range .Columns -}} {{$z := .IsQuery}} {{- if ($z) -}} - if e.{{.GoField}} != "" { + if e.{{.GoField}} != "" { table = table.Where("{{.ColumnName}} = ?", e.{{.GoField}}) - } + } {{ end -}} {{ end }}