fix(distribution): 收紧分销权限与货架状态,开通时创建站点金库
无站点成员不再视为超管;分站下架只改展示状态;装修、批量加价与提现参数对齐。
This commit is contained in:
@@ -4,7 +4,6 @@ import (
|
||||
"context"
|
||||
"errors"
|
||||
|
||||
"hfb_sys/backend/internal/model"
|
||||
"hfb_sys/backend/internal/modules/auth"
|
||||
)
|
||||
|
||||
@@ -43,19 +42,23 @@ func (s *Service) ListSitesForAdmin(ctx context.Context, adminID uint64) ([]Site
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var members []model.DistributionSiteMember
|
||||
if adminID == 0 || s.repo.db == nil {
|
||||
return items, nil
|
||||
}
|
||||
if err := s.repo.db.WithContext(ctx).Where("admin_user_id = ? AND status = 'active'", adminID).Find(&members).Error; err != nil {
|
||||
global, err := s.repo.hasGlobalDistributionAccess(ctx, adminID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(members) == 0 {
|
||||
if global {
|
||||
return items, nil
|
||||
}
|
||||
allowed := make(map[uint64]struct{}, len(members))
|
||||
for _, member := range members {
|
||||
allowed[member.SiteID] = struct{}{}
|
||||
siteIDs, err := s.repo.listActiveMemberSiteIDs(ctx, adminID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(siteIDs) == 0 {
|
||||
return []SiteDTO{}, nil
|
||||
}
|
||||
allowed := make(map[uint64]struct{}, len(siteIDs))
|
||||
for _, siteID := range siteIDs {
|
||||
allowed[siteID] = struct{}{}
|
||||
}
|
||||
filtered := make([]SiteDTO, 0, len(allowed))
|
||||
for _, item := range items {
|
||||
|
||||
Reference in New Issue
Block a user