xinyin025/hotgo
1
0
Fork 0
mirror of https://github.com/bufanyun/hotgo.git synced 2025-09-17 16:56:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复了生成选项树时，产生的service会重复引入model的问题。

Browse Source
This commit is contained in:
lsinge 2025-03-12 19:37:04 +08:00 committed by GitHub
parent 5301bedff2
commit dbdd62ecd8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/resource/generate/default/curd/logic.go.template
View File

@ -31,7 +31,7 @@ import (
@{ if eq .options.Step.IsAddon true }isc "hotgo/internal/service"@{end} @{ if eq .options.Step.IsAddon true }isc "hotgo/internal/service"@{end}
@{ if eq .options.Step.IsTreeTable true }"hotgo/utility/tree"@{end} @{ if eq .options.Step.IsTreeTable true }"hotgo/utility/tree"@{end}
@{ if eq .options.Step.HasFuncDict true }"hotgo/internal/library/dict"@{end} @{ if eq .options.Step.HasFuncDict true }"hotgo/internal/library/dict"@{end}
@{ if eq .options.Step.HasFuncDict true }"hotgo/internal/model"@{end} @{ if eq .options.Step.HasFuncDict true }hgModel "hotgo/internal/model"@{end}
) )
type s@{.servFunName} struct{} type s@{.servFunName} struct{}
@ -238,7 +238,7 @@ func (s *s@{.servFunName}) TreeOption(ctx context.Context) (nodes []tree.Node, e
@{ if eq .options.Step.HasFuncDict true } @{ if eq .options.Step.HasFuncDict true }
// Option 获取@{.tableComment}选项 // Option 获取@{.tableComment}选项
func (s *s@{.servFunName}) Option(ctx context.Context) (opts []*model.Option, err error) { func (s *s@{.servFunName}) Option(ctx context.Context) (opts []*hgModel.Option, err error) {
var models []*entity.@{.daoName} var models []*entity.@{.daoName}
if err = s.Model(ctx@{ if eq .options.Step.HasNotFilterAuth true } ,&handler.Option{FilterAuth: false}@{end}).Fields(dao.@{.daoName}.Columns().@{.options.FuncDict.Value.GoName},dao.@{.daoName}.Columns().@{.options.FuncDict.Label.GoName}). if err = s.Model(ctx@{ if eq .options.Step.HasNotFilterAuth true } ,&handler.Option{FilterAuth: false}@{end}).Fields(dao.@{.daoName}.Columns().@{.options.FuncDict.Value.GoName},dao.@{.daoName}.Columns().@{.options.FuncDict.Label.GoName}).
@{.listOrder}.Scan(&models); err != nil { @{.listOrder}.Scan(&models); err != nil {
@ -246,10 +246,10 @@ func (s *s@{.servFunName}) Option(ctx context.Context) (opts []*model.Option, er
return return
} }
opts = make([]*model.Option, len(models)) opts = make([]*hgModel.Option, len(models))
for k, v := range models { for k, v := range models {
opts[k] = dict.GenHashOption(v.@{.options.FuncDict.Value.GoName}, gconv.String(v.@{.options.FuncDict.Label.GoName})) opts[k] = dict.GenHashOption(v.@{.options.FuncDict.Value.GoName}, gconv.String(v.@{.options.FuncDict.Label.GoName}))
} }
return return
} }
@{end} @{end}