kevin/baron-sso
1
0
Fork 0
forked from baron/baron-sso
Code Pull Requests Activity

조직현황 구조변경. 총괄센터삼안 실 조직 삽입확인

Browse Source
This commit is contained in:
admin-bot
2026-05-11 20:13:54 +09:00
parent d3853fac2a
commit 3063450ee0
59 changed files with 5086 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
backend/internal/service/user_group_service.go
View File

@@ -301,13 +301,16 @@ func mapUserGroupKratosIdentityToLocalUser(identity KratosIdentity) *domain.User
updatedAt = now
}
role := userGroupTraitString(traits, "grade")
if role == "" {
role = userGroupTraitString(traits, "role")
role, ok := domain.NormalizeRoleAlias(userGroupTraitString(traits, "role"))
if !ok {
role, ok = domain.NormalizeRoleAlias(userGroupTraitString(traits, "grade"))
if !ok {
role = domain.RoleUser
}
}
role = domain.NormalizeRole(role)
if role == "" {
role = domain.RoleUser
grade := userGroupTraitString(traits, "grade")
if _, ok := domain.NormalizeRoleAlias(grade); ok {
grade = ""
}
companyCode := userGroupTraitString(traits, "companyCode")
@@ -324,6 +327,7 @@ func mapUserGroupKratosIdentityToLocalUser(identity KratosIdentity) *domain.User
Status: userGroupIdentityStatus(identity.State),
CompanyCode: companyCode,
Department: userGroupTraitString(traits, "department"),
Grade: grade,
Position: userGroupTraitString(traits, "position"),
JobTitle: userGroupTraitString(traits, "jobTitle"),
AffiliationType: userGroupTraitString(traits, "affiliationType"),

16
backend/internal/service/user_projection_sync_service.go
View File

@@ -61,13 +61,16 @@ func MapKratosIdentityToLocalUser(identity KratosIdentity) domain.User {
updatedAt = now
}
role := kratosProjectionTraitString(traits, "grade")
if role == "" {
role = kratosProjectionTraitString(traits, "role")
role, ok := domain.NormalizeRoleAlias(kratosProjectionTraitString(traits, "role"))
if !ok {
role, ok = domain.NormalizeRoleAlias(kratosProjectionTraitString(traits, "grade"))
if !ok {
role = domain.RoleUser
}
}
role = domain.NormalizeRole(role)
if role == "" {
role = domain.RoleUser
grade := kratosProjectionTraitString(traits, "grade")
if _, ok := domain.NormalizeRoleAlias(grade); ok {
grade = ""
}
companyCode := kratosProjectionTraitString(traits, "companyCode")
@@ -85,6 +88,7 @@ func MapKratosIdentityToLocalUser(identity KratosIdentity) domain.User {
CompanyCode: companyCode,
CompanyCodes: pq.StringArray(kratosProjectionTraitStringArray(traits, "companyCodes")),
Department: kratosProjectionTraitString(traits, "department"),
Grade: grade,
Position: kratosProjectionTraitString(traits, "position"),
JobTitle: kratosProjectionTraitString(traits, "jobTitle"),
AffiliationType: kratosProjectionTraitString(traits, "affiliationType"),