tt/ttstd-infinite-canvas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(admin): 系统公告 - 支持置顶排序与管理端标识

Browse Source 
Adapted from ddcat-ai/open-ai-canvas#339

Original commit: fcdbe2aa833f31f683f709b7f409a0534ed78e20

Refs #339

Co-authored-by: 宇熙 <101980758+yuxiwl@users.noreply.github.com>
This commit is contained in:
ddCat
2026-08-29 15:06:11 +08:00
parent d84b2b69cc
commit bf37e45dae
8 changed files with 84 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
backend/internal/repository/announcement.go
View File

@@ -24,7 +24,7 @@ func (r *Repository) AdminAnnouncements(keyword string, status model.Announcemen
if err := query.Count(&total).Error; err != nil {
return nil, 0, err
}
if err := query.Order("published_at desc").Limit(limit).Offset(offset).Find(&announcements).Error; err != nil {
if err := query.Order("pinned desc, published_at desc").Limit(limit).Offset(offset).Find(&announcements).Error; err != nil {
return nil, 0, err
}
return announcements, total, nil
@@ -34,7 +34,7 @@ func (r *Repository) AnnouncementFeed(userID string) ([]model.Announcement, int6
var announcements []model.Announcement
var unreadCount int64
err := r.db.Transaction(func(tx *gorm.DB) error {
if err := tx.Where("status = ?", model.AnnouncementStatusActive).Order("published_at desc").Find(&announcements).Error; err != nil {
if err := tx.Where("status = ?", model.AnnouncementStatusActive).Order("pinned desc, published_at desc").Find(&announcements).Error; err != nil {
return err
}
return tx.Model(&model.Announcement{}).
@@ -66,6 +66,7 @@ func (r *Repository) UpdateAnnouncement(announcement *model.Announcement) error
"title": announcement.Title,
"content": announcement.Content,
"level": announcement.Level,
"pinned": announcement.Pinned,
"status": announcement.Status,
"published_at": announcement.PublishedAt,
"closed_at": announcement.ClosedAt,