优化结构

internal/data/system/announcement.go

@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"kra/pkg/database/gormkit"
-	"kra/pkg/database/pagination"
 
 	"gorm.io/gorm"
 )
@@ -72,22 +71,9 @@ func (r *announcementRepo) List(ctx context.Context, filter system.AnnouncementF
 	if filter.StartCreatedAt != nil && filter.EndCreatedAt != nil {
 		db = db.Where("created_at BETWEEN ? AND ?", filter.StartCreatedAt, filter.EndCreatedAt)
 	}
-	var total int64
-	if err := db.Count(&total).Error; err != nil {
-		return nil, 0, err
-	}
-	if filter.PageSize > 0 {
-		db = pagination.Apply(db, filter.Page, filter.PageSize, 100)
-	}
-	var pos []announcementPO
-	if err := db.Find(&pos).Error; err != nil {
-		return nil, 0, err
-	}
-	items := make([]*system.Announcement, 0, len(pos))
-	for _, po := range pos {
-		items = append(items, announcementToBiz(po))
-	}
-	return items, total, nil
+	return listRows(db, filter.Page, filter.PageSize, filter.PageSize > 0, func(po announcementPO) *system.Announcement {
+		return announcementToBiz(po)
+	})
 }
 
 func (r *announcementRepo) UserOptions(ctx context.Context) ([]system.UserOption, error) {