diff --git a/api/internal/logic/adapters/clusterlistlogic.go b/api/internal/logic/adapters/clusterlistlogic.go index 764878b2..78f5b500 100644 --- a/api/internal/logic/adapters/clusterlistlogic.go +++ b/api/internal/logic/adapters/clusterlistlogic.go @@ -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+"%") diff --git a/api/internal/logic/dictionary/listdictitemlogic.go b/api/internal/logic/dictionary/listdictitemlogic.go index 3c209ad8..a0dc04ee 100644 --- a/api/internal/logic/dictionary/listdictitemlogic.go +++ b/api/internal/logic/dictionary/listdictitemlogic.go @@ -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