Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

optimize: 服务导入模板时选择的模版版本按创建时间逆向排序 #2702

Merged
merged 1 commit into from
Oct 25, 2023
+2 −2
Merged

optimize: 服务导入模板时选择的模版版本按创建时间逆向排序 #2702

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bcs-services/bcs-bscp/pkg/dal/dao/template_revision.go
View file
Original file line number Diff line number Diff line change
@@ -229,15 +229,15 @@ func (dao *templateRevisionDao) ListByTemplateIDs(kit *kit.Kit, bizID uint32, te
[]*table.TemplateRevision, error) {
m := dao.genQ.TemplateRevision
q := dao.genQ.TemplateRevision.WithContext(kit.Ctx)
return q.Where(m.BizID.Eq(bizID), m.TemplateID.In(templateIDs...)).Find()
return q.Where(m.BizID.Eq(bizID), m.TemplateID.In(templateIDs...)).Order(m.ID.Desc()).Find()
}

// ListByTemplateIDsWithTx list template revisions by template ids with transaction.
func (dao *templateRevisionDao) ListByTemplateIDsWithTx(
kit *kit.Kit, tx *gen.QueryTx, bizID uint32, templateIDs []uint32) ([]*table.TemplateRevision, error) {
m := tx.TemplateRevision
q := tx.TemplateRevision.WithContext(kit.Ctx)
return q.Where(m.BizID.Eq(bizID), m.TemplateID.In(templateIDs...)).Find()
return q.Where(m.BizID.Eq(bizID), m.TemplateID.In(templateIDs...)).Order(m.ID.Desc()).Find()
}

// DeleteForTmplWithTx delete template revision for one template with transaction.