evan/next-terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改分页返回数据结构体

Browse Source
This commit is contained in:
dushixiang
2021-03-21 16:44:33 +08:00
parent 999cf52e0c
commit 1e7b3d3c0e
15 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/repository/credential.go
View File

@ -25,7 +25,7 @@ func (r CredentialRepository) FindByUser(account model.User) (o []model.Credenti
return
}
func (r CredentialRepository) Find(pageIndex, pageSize int, name, order, field string, account model.User) (o []model.CredentialVo, total int64, err error) {
func (r CredentialRepository) Find(pageIndex, pageSize int, name, order, field string, account model.User) (o []model.CredentialForPage, total int64, err error) {
db := r.DB.Table("credentials").Select("credentials.id,credentials.name,credentials.type,credentials.username,credentials.owner,credentials.created,users.nickname as owner_name,COUNT(resource_sharers.user_id) as sharer_count").Joins("left join users on credentials.owner = users.id").Joins("left join resource_sharers on credentials.id = resource_sharers.resource_id").Group("credentials.id")
dbCounter := r.DB.Table("credentials").Select("DISTINCT credentials.id").Joins("left join resource_sharers on credentials.id = resource_sharers.resource_id").Group("credentials.id")
@ -59,7 +59,7 @@ func (r CredentialRepository) Find(pageIndex, pageSize int, name, order, field s
err = db.Order("credentials." + field + " " + order).Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&o).Error
if o == nil {
o = make([]model.CredentialVo, 0)
o = make([]model.CredentialForPage, 0)
}
return
}