From 8f705a6fc6182e697c9e425b49969a153c62fe69 Mon Sep 17 00:00:00 2001 From: liuzx Date: Fri, 10 Jun 2022 14:29:36 +0800 Subject: [PATCH] fix-2208 --- routers/repo/dataset.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/routers/repo/dataset.go b/routers/repo/dataset.go index b360dccee..f78cd1a2b 100755 --- a/routers/repo/dataset.go +++ b/routers/repo/dataset.go @@ -522,7 +522,7 @@ func MyFavoriteDataset(ctx *context.Context) { ctx.ServerError("datasets", err) return } - datasets := IsColDatasets + NotColDatasets + datasets := merge(IsColDatasets, NotColDatasets) count := NotColcount + IsColcount data, err := json.Marshal(datasets) if err != nil { @@ -541,6 +541,19 @@ func MyFavoriteDataset(ctx *context.Context) { }) } +func merge(a, b interface{}) interface{} { + + jb, err := json.Marshal(b) + if err != nil { + fmt.Println("Marshal error b:", err) + } + err = json.Unmarshal(jb, &a) + if err != nil { + fmt.Println("Unmarshal error b-a:", err) + } + + return a +} func GetDatasetStatus(ctx *context.Context) {