fix(tenant): 封堵审计文件与历史用户跨站访问

This commit is contained in:
yml
2026-11-15 22:46:58 +08:00
parent 0cb385d84f
commit 1108df195d
28 changed files with 531 additions and 60 deletions
@@ -168,7 +168,11 @@ func (r *Repository) adminListBase(ctx context.Context, query AnnouncementListQu
Select("a.id, a.distribution_site_id, COALESCE(s.site_name, '') AS distribution_site_name, a.title, a.content, a.category, a.priority, a.is_pinned, a.is_important, a.is_popup, a.view_count, a.status, a.published_at, a.created_at, a.updated_at").
Joins("LEFT JOIN distribution_sites AS s ON s.id = a.distribution_site_id")
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
base = base.Where("a.tenant_id = ?", tenantID)
base = base.
Where("a.tenant_id = ?", tenantID).
Where("(a.distribution_site_id = 0 OR a.distribution_site_id IS NULL)")
} else if query.AdminSiteID != nil {
base = base.Where("a.distribution_site_id = ?", *query.AdminSiteID)
}
if query.Status != "" {
@@ -177,9 +181,6 @@ func (r *Repository) adminListBase(ctx context.Context, query AnnouncementListQu
if query.Category != "" {
base = base.Where("a.category = ?", query.Category)
}
if query.AdminSiteID != nil {
base = base.Where("a.distribution_site_id = ?", *query.AdminSiteID)
}
return base
}
@@ -199,9 +200,13 @@ func (r *Repository) AdminGetByID(ctx context.Context, id uint64) (*Announcement
// Create 创建公告
func (r *Repository) Create(ctx context.Context, req CreateAnnouncementRequest, createdBy uint64) (*AnnouncementDTO, error) {
siteID := req.DistributionSiteID
if tenancy.IDFromContext(ctx) > 0 {
siteID = 0
}
announcement := model.Announcement{
TenantID: tenancy.IDFromContext(ctx),
DistributionSiteID: req.DistributionSiteID,
DistributionSiteID: siteID,
Title: req.Title,
Content: req.Content,
Category: req.Category,
@@ -241,7 +246,9 @@ func (r *Repository) Update(ctx context.Context, id uint64, req UpdateAnnounceme
query := r.db.WithContext(ctx).Model(&model.Announcement{}).Where("id = ?", id)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
query = query.
Where("tenant_id = ?", tenantID).
Where("(distribution_site_id = 0 OR distribution_site_id IS NULL)")
}
if err := query.Updates(updates).Error; err != nil {
return nil, err
@@ -255,7 +262,9 @@ func (r *Repository) Publish(ctx context.Context, id uint64) error {
now := time.Now()
query := r.db.WithContext(ctx).Model(&model.Announcement{}).Where("id = ?", id)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
query = query.
Where("tenant_id = ?", tenantID).
Where("(distribution_site_id = 0 OR distribution_site_id IS NULL)")
}
return query.
Updates(map[string]interface{}{
@@ -268,7 +277,9 @@ func (r *Repository) Publish(ctx context.Context, id uint64) error {
func (r *Repository) Archive(ctx context.Context, id uint64) error {
query := r.db.WithContext(ctx).Model(&model.Announcement{}).Where("id = ?", id)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
query = query.
Where("tenant_id = ?", tenantID).
Where("(distribution_site_id = 0 OR distribution_site_id IS NULL)")
}
return query.
Update("status", "archived").Error
@@ -279,7 +290,9 @@ func (r *Repository) Unarchive(ctx context.Context, id uint64) error {
now := time.Now()
query := r.db.WithContext(ctx).Model(&model.Announcement{}).Where("id = ?", id)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
query = query.
Where("tenant_id = ?", tenantID).
Where("(distribution_site_id = 0 OR distribution_site_id IS NULL)")
}
return query.
Updates(map[string]interface{}{
@@ -292,7 +305,9 @@ func (r *Repository) Unarchive(ctx context.Context, id uint64) error {
func (r *Repository) Delete(ctx context.Context, id uint64) error {
query := r.db.WithContext(ctx).Where("id = ?", id)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
query = query.
Where("tenant_id = ?", tenantID).
Where("(distribution_site_id = 0 OR distribution_site_id IS NULL)")
}
return query.Delete(&model.Announcement{}).Error
}