|
|
|
@@ -65,8 +65,8 @@ func GetUserAllBadges(userId int64) ([]models.UserAllBadgeInCategory, error) { |
|
|
|
if err != nil { |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
r := make([]models.UserAllBadgeInCategory, len(categoryList)) |
|
|
|
for i, v := range categoryList { |
|
|
|
r := make([]models.UserAllBadgeInCategory, 0) |
|
|
|
for _, v := range categoryList { |
|
|
|
badges, err := models.GetBadgeByCategoryId(v.ID) |
|
|
|
if badges == nil || len(badges) == 0 { |
|
|
|
continue |
|
|
|
@@ -89,7 +89,7 @@ func GetUserAllBadges(userId int64) ([]models.UserAllBadgeInCategory, error) { |
|
|
|
bArray[j] = b |
|
|
|
} |
|
|
|
t.Badges = bArray |
|
|
|
r[i] = t |
|
|
|
r = append(r, t) |
|
|
|
} |
|
|
|
return r, nil |
|
|
|
} |
|
|
|
|