This commit is contained in:
hero920103 committed 2026-11-11 18:42:09 +08:00
1 parent fb04d66e61
commit b6b528490c
13 files changed
+518 -168

No files matched your search

+17 -4
View File
@@ -194,9 +194,18 @@ func (c *AppAggregateController) noTenantHome(claims *jwtutil.Claims) map[string
}
}
// 展示姓名取统一身份昵称(个人中心可改),不再把账号/手机号当名字下发
displayName := ""
var ai models.AuthIdentity
if err := models.Orm.QueryTable(new(models.AuthIdentity)).
Filter("id", uint64(claims.UserID)).
Filter("delete_time__isnull", true).One(&ai); err == nil && ai.Nickname != nil {
displayName = strings.TrimSpace(*ai.Nickname)
}
return map[string]interface{}{
"user": map[string]interface{}{
"account": claims.Username, "tenant": "", "tid": 0, "need_tenant": true,
"name": displayName, "account": claims.Username, "tenant": "", "tid": 0, "need_tenant": true,
},
"modules": modules,
"menus": menus,
@@ -396,15 +405,19 @@ func (c *AppAggregateController) appUser(claims *jwtutil.Claims, uid, tid uint64
out := map[string]interface{}{
"uid": uid,
"tid": tid,
"name": "用户",
"name": "",
"account": "",
"role_name": "",
"tenant": "",
"tenant_id": tid,
"avatar": "",
}
if claims.Username != "" {
out["name"] = claims.Username
// 姓名只取真实资料(统一身份昵称,个人中心可改),不再用账号/手机号冒充
var ai models.AuthIdentity
if err := models.Orm.QueryTable(new(models.AuthIdentity)).
Filter("id", uint64(claims.UserID)).
Filter("delete_time__isnull", true).One(&ai); err == nil && ai.Nickname != nil {
out["name"] = strings.TrimSpace(*ai.Nickname)
}
var tu models.SystemTenantUser
if models.Orm.QueryTable(new(models.SystemTenantUser)).