Merge pull request 'fix bugs' (#87) from devad/pcm-coordinator:master into master
Former-commit-id: 990658095c49d9425be1f7b2a588748ab0f93351
This commit is contained in:
commit
b20d0cbee7
|
@ -30,14 +30,16 @@ func (l *PageListTaskLogic) PageListTask(req *types.PageTaskReq) (resp *types.Pa
|
||||||
resp = &types.PageResult{}
|
resp = &types.PageResult{}
|
||||||
var list []types.TaskModel
|
var list []types.TaskModel
|
||||||
db := l.svcCtx.DbEngin.Model(&types.TaskModel{}).Table("task")
|
db := l.svcCtx.DbEngin.Model(&types.TaskModel{}).Table("task")
|
||||||
|
|
||||||
|
db = db.Where("deleted_at is null")
|
||||||
if req.Name != "" {
|
if req.Name != "" {
|
||||||
db = db.Where("name LIKE ?", "%"+req.Name+"%")
|
db = db.Where("name LIKE ?", "%"+req.Name+"%")
|
||||||
}
|
}
|
||||||
db = db.Where("deleted_at is null").Limit(limit).Offset(offset)
|
|
||||||
|
|
||||||
//count total
|
//count total
|
||||||
var total int64
|
var total int64
|
||||||
err = db.Count(&total).Error
|
err = db.Count(&total).Error
|
||||||
|
db.Limit(limit).Offset(offset)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return resp, err
|
return resp, err
|
||||||
|
|
Loading…
Reference in New Issue