File tree Expand file tree Collapse file tree 1 file changed +13
-2
lines changed
Expand file tree Collapse file tree 1 file changed +13
-2
lines changed Original file line number Diff line number Diff line change @@ -89,6 +89,17 @@ def profile(user: User, auth: Auth):
8989 @return:
9090 """
9191 workspace_list = get_workspace_list_by_user (user .id )
92+ user_role_relation_model = DatabaseModelManage .get_model ("workspace_user_role_mapping" )
93+ role_name = user .role
94+ if user_role_relation_model :
95+ user_role_relations = (
96+ user_role_relation_model .objects
97+ .filter (user_id = user .id )
98+ .select_related ('role' )
99+ .distinct ('role_id' )
100+ )
101+ role_name = [relation .role .role_name for relation in user_role_relations ]
102+
92103 return {
93104 'id' : user .id ,
94105 'username' : user .username ,
@@ -98,7 +109,8 @@ def profile(user: User, auth: Auth):
98109 'permissions' : auth .permission_list ,
99110 'is_edit_password' : user .role == RoleConstants .ADMIN .name and user .password == 'd880e722c47a34d8e9fce789fc62389d' ,
100111 'language' : user .language ,
101- 'workspace_list' : workspace_list
112+ 'workspace_list' : workspace_list ,
113+ 'role_name' : role_name
102114 }
103115
104116
@@ -230,7 +242,6 @@ def _get_user_roles(user_ids):
230242 if not (role_model and user_role_relation_model ):
231243 return {}
232244
233- # 获取所有相关角色关系,并预加载角色信息
234245 # 获取所有相关角色关系,并预加载角色信息
235246 user_role_relations = (
236247 user_role_relation_model .objects
You can’t perform that action at this time.
0 commit comments