fix
Signed-off-by: jagger <cossjie@foxmail.com> Former-commit-id: 836d8f7f97db13bab73ba5a9575ef0654caea401
This commit is contained in:
parent
529d333d76
commit
6f9cf73cd4
|
@ -27,9 +27,9 @@ func (l *ClusterListLogic) ClusterList(req *types.ClusterReq) (resp *types.PageR
|
||||||
offset := req.PageSize * (req.PageNum - 1)
|
offset := req.PageSize * (req.PageNum - 1)
|
||||||
resp = &types.PageResult{}
|
resp = &types.PageResult{}
|
||||||
var list []types.ClusterInfo
|
var list []types.ClusterInfo
|
||||||
db := l.svcCtx.DbEngin.Model(&types.AdapterInfo{}).Table("t_adapter")
|
db := l.svcCtx.DbEngin.Model(&types.AdapterInfo{}).Table("t_cluster")
|
||||||
|
|
||||||
db = db.Joins("left join t_cluster on t_adapter.id = t_cluster.adapter_id").
|
db = db.Joins("left join t_adapter on t_adapter.id = t_cluster.adapter_id").
|
||||||
Where("t_cluster.deleted_at is null")
|
Where("t_cluster.deleted_at is null")
|
||||||
if req.Name != "" {
|
if req.Name != "" {
|
||||||
db = db.Where("t_cluster.name LIKE ?", "%"+req.Name+"%")
|
db = db.Where("t_cluster.name LIKE ?", "%"+req.Name+"%")
|
||||||
|
|
|
@ -54,7 +54,7 @@ func (l *ListDictItemLogic) ListDictItem(req *types.DictItemReq) (resp *types.Pa
|
||||||
return resp, err
|
return resp, err
|
||||||
}
|
}
|
||||||
db = db.Limit(limit).Offset(offset)
|
db = db.Limit(limit).Offset(offset)
|
||||||
err = db.Order("create_time desc").Find(&dictList).Error
|
err = db.Order("sort_order").Find(&dictList).Error
|
||||||
|
|
||||||
resp.List = dictList
|
resp.List = dictList
|
||||||
resp.PageSize = req.PageSize
|
resp.PageSize = req.PageSize
|
||||||
|
|
Loading…
Reference in New Issue