feat(tenant): 隔离客服通知文件与后台任务

This commit is contained in:
yml
2026-11-15 16:23:28 +08:00
parent c7dacfa025
commit e994fd9166
52 changed files with 1670 additions and 254 deletions
@@ -6,6 +6,7 @@ import (
"strings"
"hfb_sys/backend/internal/model"
"hfb_sys/backend/internal/tenancy"
"gorm.io/gorm"
"gorm.io/gorm/clause"
@@ -21,7 +22,8 @@ func NewRepository(db *gorm.DB) *Repository {
func (r *Repository) List(ctx context.Context) ([]GroupDTO, error) {
var groups []model.ChatSupportGroup
if err := r.db.WithContext(ctx).Order("sort_order ASC, id ASC").Find(&groups).Error; err != nil {
query := tenantScope(ctx, r.db.WithContext(ctx))
if err := query.Order("sort_order ASC, id ASC").Find(&groups).Error; err != nil {
return nil, err
}
items := make([]GroupDTO, 0, len(groups))
@@ -37,7 +39,7 @@ func (r *Repository) List(ctx context.Context) ([]GroupDTO, error) {
func (r *Repository) FindByID(ctx context.Context, id uint64) (*GroupDTO, error) {
var group model.ChatSupportGroup
if err := r.db.WithContext(ctx).First(&group, id).Error; err != nil {
if err := tenantScope(ctx, r.db.WithContext(ctx)).First(&group, id).Error; err != nil {
return nil, err
}
dto, err := r.toDTO(ctx, group)
@@ -54,6 +56,7 @@ func (r *Repository) Create(ctx context.Context, req CreateGroupRequest) (*Group
}
status := normalizeStatus(req.Status)
group := model.ChatSupportGroup{
TenantID: tenancy.IDFromContext(ctx),
Code: code,
Name: strings.TrimSpace(req.Name),
Description: strings.TrimSpace(req.Description),
@@ -75,7 +78,7 @@ func (r *Repository) Create(ctx context.Context, req CreateGroupRequest) (*Group
func (r *Repository) Update(ctx context.Context, id uint64, req UpdateGroupRequest) (*GroupDTO, error) {
var group model.ChatSupportGroup
db := r.db.WithContext(ctx)
if err := db.First(&group, id).Error; err != nil {
if err := tenantScope(ctx, db).First(&group, id).Error; err != nil {
return nil, err
}
group.Name = strings.TrimSpace(req.Name)
@@ -97,7 +100,7 @@ func (r *Repository) Update(ctx context.Context, id uint64, req UpdateGroupReque
func (r *Repository) Delete(ctx context.Context, id uint64) error {
var group model.ChatSupportGroup
db := r.db.WithContext(ctx)
if err := db.First(&group, id).Error; err != nil {
if err := tenantScope(ctx, db).First(&group, id).Error; err != nil {
return err
}
if isProtectedCode(group.Code) {
@@ -113,7 +116,7 @@ func (r *Repository) Delete(ctx context.Context, id uint64) error {
func (r *Repository) AssignMembers(ctx context.Context, id uint64, memberIDs []uint64) error {
var count int64
if err := r.db.WithContext(ctx).Model(&model.ChatSupportGroup{}).Where("id = ?", id).Count(&count).Error; err != nil {
if err := tenantScope(ctx, r.db.WithContext(ctx)).Model(&model.ChatSupportGroup{}).Where("id = ?", id).Count(&count).Error; err != nil {
return err
}
if count == 0 {
@@ -131,11 +134,16 @@ func (r *Repository) ListSupportAdmins(ctx context.Context) ([]MemberDTO, error)
Nickname string
SupportStatus string
}
err := r.db.WithContext(ctx).Table("admin_users AS au").
tenantID := tenancy.IDFromContext(ctx)
query := r.db.WithContext(ctx).Table("admin_users AS au").
Select("DISTINCT au.id, au.username, au.nickname, au.support_status").
Joins("JOIN admin_user_roles AS aur ON aur.admin_user_id = au.id").
Joins("JOIN roles AS r ON r.id = aur.role_id").
Where("au.status = ? AND r.code = ?", "active", "cs").
Where("au.status = ? AND r.code = ?", "active", "cs")
if tenantID > 0 {
query = query.Where("aur.tenant_id = ?", tenantID)
}
err := query.
Order("CASE au.support_status WHEN 'online' THEN 0 WHEN 'busy' THEN 1 ELSE 2 END, au.id ASC").
Scan(&rows).Error
if err != nil {
@@ -200,6 +208,10 @@ func (r *Repository) members(ctx context.Context, groupID uint64) ([]MemberDTO,
}
func replaceMembers(tx *gorm.DB, groupID uint64, memberIDs []uint64) error {
var group model.ChatSupportGroup
if err := tx.Select("tenant_id").First(&group, groupID).Error; err != nil {
return err
}
if err := tx.Where("group_id = ?", groupID).Delete(&model.ChatSupportGroupMember{}).Error; err != nil {
return err
}
@@ -207,6 +219,17 @@ func replaceMembers(tx *gorm.DB, groupID uint64, memberIDs []uint64) error {
if adminID == 0 {
continue
}
if group.TenantID > 0 {
var count int64
if err := tx.Table("admin_user_roles").
Where("admin_user_id = ? AND tenant_id = ?", adminID, group.TenantID).
Count(&count).Error; err != nil {
return err
}
if count == 0 {
continue
}
}
member := model.ChatSupportGroupMember{GroupID: groupID, AdminID: adminID}
if err := tx.Clauses(clause.OnConflict{DoNothing: true}).Create(&member).Error; err != nil {
return err
@@ -251,6 +274,13 @@ func uniqueIDs(ids []uint64) []uint64 {
return result
}
func tenantScope(ctx context.Context, db *gorm.DB) *gorm.DB {
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
return db.Where("tenant_id = ?", tenantID)
}
return db
}
func IsNotFound(err error) bool {
return errors.Is(err, gorm.ErrRecordNotFound)
}
@@ -9,14 +9,29 @@ import (
)
func PickSupportAdmin(tx *gorm.DB, groupCode string) (uint64, error) {
return pickSupportAdmin(tx, groupCode, 0)
}
// PickSupportAdminForTenant 仅在指定经营租户的客服分组和角色绑定中选人。
func PickSupportAdminForTenant(tx *gorm.DB, groupCode string, tenantID uint64) (uint64, error) {
return pickSupportAdmin(tx, groupCode, tenantID)
}
func pickSupportAdmin(tx *gorm.DB, groupCode string, tenantID uint64) (uint64, error) {
var row struct {
ID uint64
}
err := tx.Table("chat_support_groups AS g").
query := tx.Table("chat_support_groups AS g").
Select("au.id").
Joins("JOIN chat_support_group_members AS gm ON gm.group_id = g.id").
Joins("JOIN admin_users AS au ON au.id = gm.admin_user_id").
Where("g.code = ? AND g.status = ? AND au.status = ?", groupCode, "active", "active").
Joins("JOIN admin_user_roles AS aur ON aur.admin_user_id = au.id").
Joins("JOIN roles AS r ON r.id = aur.role_id").
Where("g.code = ? AND g.status = ? AND au.status = ? AND r.code = ?", groupCode, "active", "active", "cs")
if tenantID > 0 {
query = query.Where("g.tenant_id = ? AND aur.tenant_id = ?", tenantID, tenantID)
}
err := query.
Order(`CASE au.support_status WHEN 'online' THEN 0 WHEN 'busy' THEN 1 ELSE 2 END,
(
SELECT COUNT(1)
@@ -34,16 +49,20 @@ func PickSupportAdmin(tx *gorm.DB, groupCode string) (uint64, error) {
if row.ID > 0 {
return row.ID, nil
}
return fallbackSupportAdmin(tx)
return fallbackSupportAdmin(tx, tenantID)
}
func fallbackSupportAdmin(tx *gorm.DB) (uint64, error) {
func fallbackSupportAdmin(tx *gorm.DB, tenantID uint64) (uint64, error) {
var admin model.AdminUser
err := tx.Table("admin_users AS au").
query := tx.Table("admin_users AS au").
Select("au.*").
Joins("JOIN admin_user_roles AS aur ON aur.admin_user_id = au.id").
Joins("JOIN roles AS r ON r.id = aur.role_id").
Where("au.status = ? AND r.code = ?", "active", "cs").
Where("au.status = ? AND r.code = ?", "active", "cs")
if tenantID > 0 {
query = query.Where("aur.tenant_id = ?", tenantID)
}
err := query.
Order("CASE au.support_status WHEN 'online' THEN 0 WHEN 'busy' THEN 1 ELSE 2 END, au.id ASC").
Limit(1).
First(&admin).Error