From 85194599c867aec104abf42d38e10d0e4fb0b68c Mon Sep 17 00:00:00 2001 From: wxg0103 <727495428@qq.com> Date: Mon, 7 Jul 2025 18:51:05 +0800 Subject: [PATCH] refactor: update workspace_ids assignment logic for user roles in UserDrawer --- .../user-manage/component/UserDrawer.vue | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/ui/src/views/system/user-manage/component/UserDrawer.vue b/ui/src/views/system/user-manage/component/UserDrawer.vue index 460f0b21..07ebba6d 100644 --- a/ui/src/views/system/user-manage/component/UserDrawer.vue +++ b/ui/src/views/system/user-manage/component/UserDrawer.vue @@ -280,10 +280,22 @@ const submit = async (formEl: FormInstance | undefined) => { await memberFormContentRef.value?.validate() } if (user.isPE() || user.isEE()) { - list.value = list.value.map(item => ({ - ...item, - workspace_ids: adminRoleList.value.find(item1 => item1.id === item.role_id) ? ['None'] : item.workspace_ids - })) + list.value = list.value.map(item => { + const isAdminRole = adminRoleList.value.find(item1 => item1.id === item.role_id); + + // 如果是管理员角色,则设置为 ['None'] + if (isAdminRole) { + return {...item, workspace_ids: ['None']}; + } + + // 如果是普通用户且是 PE 类型,则设置为 ['default'] + if (user.isPE()) { + return {...item, workspace_ids: ['default']}; + } + + // 其他情况保持原样 + return item; + }); } const params = { ...userForm.value,