From 9cd45ed81d4864c586d873e6bdf3154b24cff2fc Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Wed, 26 Apr 2023 11:19:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E7=A7=9F=E6=88=B7=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=88=96=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=EF=BC=8C=E9=80=89=E6=8B=A9=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E4=B8=80=E6=A0=8F=EF=BC=8C=E8=A7=92=E8=89=B2=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=81=9A=E7=A7=9F=E6=88=B7=E9=9A=94=E7=A6=BB?=
 =?UTF-8?q?=20#4844?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/TenantUserList.vue | 3 +++
 src/views/system/user/UserDrawer.vue     | 8 +++++++-
 src/views/system/user/index.vue          | 3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/views/system/user/TenantUserList.vue b/src/views/system/user/TenantUserList.vue
index 54ee83b..a373671 100644
--- a/src/views/system/user/TenantUserList.vue
+++ b/src/views/system/user/TenantUserList.vue
@@ -83,6 +83,7 @@
     openDrawer(true, {
       isUpdate: false,
       showFooter: true,
+      tenantSaas: true,
     });
   }
   /**
@@ -93,6 +94,7 @@
       record,
       isUpdate: true,
       showFooter: true,
+      tenantSaas: true,
     });
   }
   /**
@@ -103,6 +105,7 @@
       record,
       isUpdate: true,
       showFooter: false,
+      tenantSaas: true,
     });
   }
 
diff --git a/src/views/system/user/UserDrawer.vue b/src/views/system/user/UserDrawer.vue
index 3943b53..57ff8e0 100644
--- a/src/views/system/user/UserDrawer.vue
+++ b/src/views/system/user/UserDrawer.vue
@@ -16,7 +16,7 @@
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { formSchema } from './user.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { saveOrUpdateUser, getUserRoles, getUserDepartList } from './user.api';
+  import { saveOrUpdateUser, getUserRoles, getUserDepartList, getAllRolesListNoByTenant, getAllRolesList } from './user.api';
   import { useDrawerAdaptiveWidth } from '/@/hooks/jeecg/useAdaptiveWidth';
   // 声明Emits
   const emit = defineEmits(['success', 'register']);
@@ -99,6 +99,12 @@
       {
         field: 'selectedroles',
         show: !data?.departDisabled ?? false,
+        //update-begin---author:wangshuai ---date:20230424  for：【issues/4844】多租户模式下，新增或编辑用户，选择角色一栏，角色选项没有做租户隔离------------
+        //判断是否为多租户模式
+        componentProps:{
+          api: data.tenantSaas?getAllRolesList:getAllRolesListNoByTenant
+        }
+        //update-end---author:wangshuai ---date:20230424  for：【issues/4844】多租户模式下，新增或编辑用户，选择角色一栏，角色选项没有做租户隔离------------
       },
     ]);
     // 无论新增还是编辑，都可以设置表单值
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 173bfd2..e700dcc 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -125,6 +125,7 @@
     openDrawer(true, {
       isUpdate: false,
       showFooter: true,
+      tenantSaas: false,
     });
   }
   /**
@@ -135,6 +136,7 @@
       record,
       isUpdate: true,
       showFooter: true,
+      tenantSaas: false,
     });
   }
   /**
@@ -145,6 +147,7 @@
       record,
       isUpdate: true,
       showFooter: false,
+      tenantSaas: false,
     });
   }
   /**