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,
     });
   }
   /**