zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: user

Browse Source
This commit is contained in:
wxg0103 2025-06-19 14:37:47 +08:00
parent 9891c96e54
commit af61494779
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/users/serializers/user.py
View File

@ -202,13 +202,14 @@ class UserManageSerializer(serializers.Serializer):
user_role_relations = ( user_role_relations = (
user_role_relation_model.objects user_role_relation_model.objects
.filter(user_id__in=user_ids) .filter(user_id__in=user_ids)
.distinct('user_id', 'role_id') # 确保每个用户每个角色只返回一次
.select_related('role') # 预加载外键数据 .select_related('role') # 预加载外键数据
) )
# 构建用户ID到角色名称列表的映射 # 构建用户ID到角色名称列表的映射
user_role_mapping = defaultdict(list) user_role_mapping = defaultdict(list)
for relation in user_role_relations: for relation in user_role_relations:
user_role_mapping[relation.user_id].append(relation.role.role_name) user_role_mapping[str(relation.user_id)].append(relation.role.role_name)
return user_role_mapping return user_role_mapping
@ -218,7 +219,7 @@ class UserManageSerializer(serializers.Serializer):
# 将角色信息添加回用户数据中 # 将角色信息添加回用户数据中
for user in result['records']: for user in result['records']:
user['role'] = user_role_mapping.get(user['id'], []) user['role'] = user_role_mapping.get(str(user['id']), [])
return result return result
@valid_license(model=User, count=2, @valid_license(model=User, count=2,
@ -486,22 +487,15 @@ class UserManageSerializer(serializers.Serializer):
def update_user_role(instance, user): def update_user_role(instance, user):
workspace_user_role_mapping_model = DatabaseModelManage.get_model("workspace_user_role_mapping") workspace_user_role_mapping_model = DatabaseModelManage.get_model("workspace_user_role_mapping")
role_setting_model = DatabaseModelManage.get_model("role_model")
if workspace_user_role_mapping_model: if workspace_user_role_mapping_model:
role_setting = instance.get('role_setting') role_setting = instance.get('role_setting')
workspace_user_role_mapping_model.objects.filter(user_id=user.id).delete() workspace_user_role_mapping_model.objects.filter(user_id=user.id).delete()
relations = set() relations = set()
for item in role_setting: for item in role_setting:
for role_id, workspace_ids in item.items(): role_id = item['role_id']
relations.update(set(product([role_id], workspace_ids))) workspace_ids = item['workspace_ids'] if item['workspace_ids'] else ['None']
for workspace_id in workspace_ids:
role_ids = {role_id for item in role_setting for role_id in item} relations.add((role_id, workspace_id))
role_ids_is_system = role_setting_model.objects.filter(id__in=role_ids,
type=RoleConstants.ADMIN.name).values_list(
'id', flat=True)
if role_ids_is_system:
relations = {(role_id, 'SYSTEM') if role_id in role_ids_is_system else (role_id, workspace_id)
for role_id, workspace_id in relations}
for role_id, workspace_id in relations: for role_id, workspace_id in relations:
workspace_user_role_mapping_model.objects.create( workspace_user_role_mapping_model.objects.create(
id=uuid.uuid7(), id=uuid.uuid7(),