Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
This commit is contained in:
commit
27b75bd908
@ -1 +1 @@
|
||||
Subproject commit e8d0e1e67593db6463c0b36870a6865e380e7a9e
|
||||
Subproject commit cb2eeca59b71f1ae511773a57768ad4ddb594b4c
|
@ -16,7 +16,7 @@ func PageDraftingQuery(query *dto.PageDraftingReqDto) (*dto.PageDto, error) {
|
||||
if query.Name != "" {
|
||||
dq = dq.Where(d.Name.Like(fmt.Sprintf("%%%s%%", query.Name)))
|
||||
}
|
||||
records, total, err := dq.Debug().Select(d.ID, d.Name, d.Category, d.UpdateAt, d.CreatedAt, d.CreatorID).FindByPage(query.Offset(), query.Size)
|
||||
records, total, err := dq.Debug().Omit(d.Proto).FindByPage(query.Offset(), query.Size)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
@ -95,9 +95,9 @@ func UpdateDrafting(id int32, dto *dto.DraftingDto) bool {
|
||||
oldD.Name = dto.Name
|
||||
}
|
||||
oldD.UpdateAt = time.Now()
|
||||
_, error := dbquery.Drafting.Updates(oldD)
|
||||
if error != nil {
|
||||
panic(error)
|
||||
_, err2 := dbquery.Drafting.Updates(oldD)
|
||||
if err2 != nil {
|
||||
panic(err2)
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user