pro/olons_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: select support identity by IM tenant
Deploy olons-server production / deploy (push) Successful in 5m4s
Details

Browse Source
This commit is contained in:
Your Name
2026-10-20 21:42:43 +08:00
parent 975a2a2ed2
commit 6954d375b5
3 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/store/support.go
+5 -4
View File
@@ -37,13 +37,14 @@ func (s *Store) CustomerServiceByID(ctx context.Context, tenantID, serviceID int
return &row, err
}
func (s *Store) MemberIMIdentity(ctx context.Context, tenantID, memberID int64) (*MemberIMIdentity, error) {
func (s *Store) MemberIMIdentityForTenant(ctx context.Context, tenantID, memberID int64, imTenantCode string) (*MemberIMIdentity, error) {
if s == nil || s.db == nil {
return nil, errors.New("store is unavailable")
}
var row MemberIMIdentity
err := s.db.GetContext(ctx, &row, `SELECT id,tenant_id,member_id,im_tenant_code,im_user_id,im_username,im_password_cipher
FROM hg_app_member_im_identity WHERE tenant_id=? AND member_id=? LIMIT 1`, tenantID, memberID)
FROM hg_app_member_im_identity WHERE tenant_id=? AND member_id=? AND im_tenant_code=? LIMIT 1`,
tenantID, memberID, imTenantCode)
if errors.Is(err, sql.ErrNoRows) {
return nil, ErrResourceNotFound
}
@@ -77,10 +78,10 @@ func (s *Store) SaveMemberIMIdentity(ctx context.Context, identity *MemberIMIden
im_password_cipher=VALUES(im_password_cipher),sync_status=1,last_error='',updated_at=UTC_TIMESTAMP(3)`,
identity.TenantID, identity.MemberID, identity.IMTenantCode, identity.IMUserID, identity.IMUsername, identity.IMPasswordCipher)
if err == nil {
return s.MemberIMIdentity(ctx, identity.TenantID, identity.MemberID)
return s.MemberIMIdentityForTenant(ctx, identity.TenantID, identity.MemberID, identity.IMTenantCode)
}
// A concurrent request may have completed the same deterministic mapping.
existing, findErr := s.MemberIMIdentity(ctx, identity.TenantID, identity.MemberID)
existing, findErr := s.MemberIMIdentityForTenant(ctx, identity.TenantID, identity.MemberID, identity.IMTenantCode)
if findErr == nil {
return existing, nil
}