floraachy
/
pcm-coordinator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 

Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 836d8f7f97db13bab73ba5a9575ef0654caea401
This commit is contained in:
jagger 2024-04-19 15:40:01 +08:00
parent 529d333d76
commit 6f9cf73cd4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/internal/logic/adapters/clusterlistlogic.go
View File

@ -27,9 +27,9 @@ func (l *ClusterListLogic) ClusterList(req *types.ClusterReq) (resp *types.PageR
offset := req.PageSize * (req.PageNum - 1)
resp = &types.PageResult{}
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")
if req.Name != "" {
db = db.Where("t_cluster.name LIKE ?", "%"+req.Name+"%")

2
api/internal/logic/dictionary/listdictitemlogic.go
View File

@ -54,7 +54,7 @@ func (l *ListDictItemLogic) ListDictItem(req *types.DictItemReq) (resp *types.Pa
return resp, err
}
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.PageSize = req.PageSize