|
@ -40,7 +40,7 @@ func (s *sHomework) GetHomeworkList(ctx context.Context, pageNo int, pageSize in |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// 如果Redis中没有数据,查询数据库
|
|
|
// 如果Redis中没有数据,查询数据库
|
|
|
err = dao.ActivityInteractiveGroup.Ctx(ctx).With(entity.Live{}).Order("status asc, start_date desc, end_date desc").Page(pageNo, pageSize).Scan(&homeworkList) |
|
|
|
|
|
|
|
|
err = dao.ActivityInteractiveGroup.Ctx(ctx).With(entity.Live{}).Order("start_date desc, end_date desc").Page(pageNo, pageSize).Scan(&homeworkList) |
|
|
err = g.DB("cms").Model("fx_article").Where("id", gdb.ListItemValuesUnique(homeworkList, "ArticleId")).ScanList(&homeworkList, "Article", "id:ArticleId") |
|
|
err = g.DB("cms").Model("fx_article").Where("id", gdb.ListItemValuesUnique(homeworkList, "ArticleId")).ScanList(&homeworkList, "Article", "id:ArticleId") |
|
|
homeworkList = UpdateHomework(ctx, homeworkList) |
|
|
homeworkList = UpdateHomework(ctx, homeworkList) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|