Merge branch 'bufanyun:v2.0' into v2.0-refactoring

This commit is contained in:
Lingjie Fu
2024-09-19 19:37:17 +08:00
committed by GitHub
7 changed files with 21 additions and 11 deletions

View File

@@ -177,8 +177,14 @@ func (s *sSysGenCodes) List(ctx context.Context, in *sysin.GenCodesListInp) (lis
if row == nil {
return ""
}
genType := int(row.GenType)
if genType == consts.GenCodesTypeTree {
genType = consts.GenCodesTypeCurd
}
for _, v := range typeSelect {
if v.Value == int(row.GenType) {
if v.Value == genType {
for index, template := range v.Templates {
if index == row.GenTemplate {
return template.Label
@@ -186,7 +192,6 @@ func (s *sSysGenCodes) List(ctx context.Context, in *sysin.GenCodesListInp) (lis
}
}
}
return ""
}