From 7bab382d8db005cd734f4d630470290a97649562 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Mon, 29 May 2023 11:14:23 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90issues/4935=E3=80=91=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BC=96=E8=BE=91=E7=95=8C=E9=9D=A2=E4=B8=AD?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=E4=B8=8B=E6=8B=89=E6=A1=86=E6=9C=AA=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=BD=93=E5=89=8D=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=89=80=E6=9C=89=E7=9A=84=E7=A7=9F=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/UserDrawer.vue | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/views/system/user/UserDrawer.vue b/src/views/system/user/UserDrawer.vue
index 57ff8e0..fd1b7ea 100644
--- a/src/views/system/user/UserDrawer.vue
+++ b/src/views/system/user/UserDrawer.vue
@@ -18,6 +18,8 @@
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { saveOrUpdateUser, getUserRoles, getUserDepartList, getAllRolesListNoByTenant, getAllRolesList } from './user.api';
   import { useDrawerAdaptiveWidth } from '/@/hooks/jeecg/useAdaptiveWidth';
+  import { getTenantId } from "/@/utils/auth";
+
   // 声明Emits
   const emit = defineEmits(['success', 'register']);
   const attrs = useAttrs();
@@ -106,7 +108,20 @@
         }
         //update-end---author:wangshuai ---date:20230424  for：【issues/4844】多租户模式下，新增或编辑用户，选择角色一栏，角色选项没有做租户隔离------------
       },
+      //update-begin---author:wangshuai ---date:20230522  for：【issues/4935】租户用户编辑界面中租户下拉框未过滤，显示当前系统所有的租户------------
+      {
+        field: 'relTenantIds',
+        componentProps:{
+          disabled: !!data.tenantSaas,
+        },
+      },
+      //update-end---author:wangshuai ---date:20230522  for：【issues/4935】租户用户编辑界面中租户下拉框未过滤，显示当前系统所有的租户------------
     ]);
+    //update-begin---author:wangshuai ---date:20230522  for：【issues/4935】租户用户编辑界面中租户下拉框未过滤，显示当前系统所有的租户------------
+    if(!unref(isUpdate) && data.tenantSaas){
+      await setFieldsValue({ relTenantIds: getTenantId().toString() })
+    }
+    //update-end---author:wangshuai ---date:20230522  for：【issues/4935】租户用户编辑界面中租户下拉框未过滤，显示当前系统所有的租户------------
     // 无论新增还是编辑，都可以设置表单值
     if (typeof data.record === 'object') {
       setFieldsValue({