提交
This commit is contained in:
1 parent
80138c6388
commit
693e8a678e
682 files changed
+211375
-5306
No files matched your search
@@ -232,6 +232,10 @@ async def get_current_user_by_token(
|
||||
s = str(avatar_raw).strip()
|
||||
avatar_stored = s if s else None
|
||||
|
||||
from app.services.issue_user_tokens import resolve_user_org_labels
|
||||
|
||||
dept_name, post_names = resolve_user_org_labels(db, user)
|
||||
|
||||
current_user_dept_id.set(user.dept_id or "")
|
||||
|
||||
return {
|
||||
@@ -240,7 +244,11 @@ async def get_current_user_by_token(
|
||||
"real_name": user.nick_name,
|
||||
"role": web_role,
|
||||
"role_names": role_names,
|
||||
"tenant_no": (getattr(user, "tenant_no", None) or "").strip() or None,
|
||||
"region_id": user.dept_id,
|
||||
"region_name": dept_name,
|
||||
"dept_name": dept_name,
|
||||
"post_names": post_names,
|
||||
"phone": phone,
|
||||
"email": email,
|
||||
"sex": getattr(user, "sex", None) or "0",
|
||||
|
||||
Reference in new issue
Block a user