feat(tenant): 按租户隔离用户身份与后台权限
This commit is contained in:
@@ -13,6 +13,7 @@ import (
|
||||
|
||||
"hfb_sys/backend/internal/model"
|
||||
"hfb_sys/backend/internal/modules/wallet"
|
||||
"hfb_sys/backend/internal/tenancy"
|
||||
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/clause"
|
||||
@@ -65,7 +66,11 @@ func (r *Repository) GenerateUniqueInviteCode(ctx context.Context) (string, erro
|
||||
}
|
||||
code := hex.EncodeToString(bytes)[:7] // 7 位如 0d76234
|
||||
var count int64
|
||||
if err := r.db.WithContext(ctx).Model(&model.User{}).Where("invite_code = ?", code).Count(&count).Error; err != nil {
|
||||
query := r.db.WithContext(ctx).Model(&model.User{}).Where("invite_code = ?", code)
|
||||
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
|
||||
query = query.Where("tenant_id = ?", tenantID)
|
||||
}
|
||||
if err := query.Count(&count).Error; err != nil {
|
||||
return "", err
|
||||
}
|
||||
if count == 0 {
|
||||
@@ -81,7 +86,11 @@ func (r *Repository) EnsureUserInviteCode(ctx context.Context, userID uint64) (s
|
||||
return "", ErrDependencyUnavailable
|
||||
}
|
||||
var user model.User
|
||||
if err := r.db.WithContext(ctx).First(&user, userID).Error; err != nil {
|
||||
query := r.db.WithContext(ctx).Where("id = ?", userID)
|
||||
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
|
||||
query = query.Where("tenant_id = ?", tenantID)
|
||||
}
|
||||
if err := query.First(&user).Error; err != nil {
|
||||
return "", err
|
||||
}
|
||||
if user.InviteCode != nil && *user.InviteCode != "" {
|
||||
@@ -106,7 +115,11 @@ func (r *Repository) OnUserRealnameVerified(ctx context.Context, userID uint64)
|
||||
}
|
||||
return r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
var user model.User
|
||||
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&user, userID).Error; err != nil {
|
||||
userQuery := tx.Clauses(clause.Locking{Strength: "UPDATE"}).Where("id = ?", userID)
|
||||
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
|
||||
userQuery = userQuery.Where("tenant_id = ?", tenantID)
|
||||
}
|
||||
if err := userQuery.First(&user).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
now := time.Now()
|
||||
@@ -120,7 +133,11 @@ func (r *Repository) OnUserRealnameVerified(ctx context.Context, userID uint64)
|
||||
}
|
||||
code := hex.EncodeToString(bytes)[:7]
|
||||
var count int64
|
||||
if err := tx.Model(&model.User{}).Where("invite_code = ?", code).Count(&count).Error; err != nil {
|
||||
countQuery := tx.Model(&model.User{}).Where("invite_code = ?", code)
|
||||
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
|
||||
countQuery = countQuery.Where("tenant_id = ?", tenantID)
|
||||
}
|
||||
if err := countQuery.Count(&count).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if count == 0 {
|
||||
@@ -162,7 +179,11 @@ func (r *Repository) GetInviteCodeInfo(ctx context.Context, code string) (*Invit
|
||||
return &InviteCodeInfoDTO{Valid: false}, nil
|
||||
}
|
||||
var user model.User
|
||||
if err := r.db.WithContext(ctx).Where("invite_code = ?", cleanCode).First(&user).Error; err != nil {
|
||||
query := r.db.WithContext(ctx).Where("invite_code = ?", cleanCode)
|
||||
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
|
||||
query = query.Where("tenant_id = ?", tenantID)
|
||||
}
|
||||
if err := query.First(&user).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return &InviteCodeInfoDTO{Valid: false, InviteCode: cleanCode}, nil
|
||||
}
|
||||
@@ -201,7 +222,11 @@ func (r *Repository) BindInvitation(ctx context.Context, inviteeID uint64, code
|
||||
}
|
||||
|
||||
var inviter model.User
|
||||
if err := tx.Where("invite_code = ?", cleanCode).First(&inviter).Error; err != nil {
|
||||
inviterQuery := tx.Where("invite_code = ?", cleanCode)
|
||||
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
|
||||
inviterQuery = inviterQuery.Where("tenant_id = ?", tenantID)
|
||||
}
|
||||
if err := inviterQuery.First(&inviter).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return ErrInvalidInviteCode
|
||||
}
|
||||
@@ -223,7 +248,11 @@ func (r *Repository) BindInvitation(ctx context.Context, inviteeID uint64, code
|
||||
}
|
||||
|
||||
var invitee model.User
|
||||
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&invitee, inviteeID).Error; err != nil {
|
||||
inviteeQuery := tx.Clauses(clause.Locking{Strength: "UPDATE"}).Where("id = ?", inviteeID)
|
||||
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
|
||||
inviteeQuery = inviteeQuery.Where("tenant_id = ?", tenantID)
|
||||
}
|
||||
if err := inviteeQuery.First(&invitee).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user