fix: 管理台新增部分权限标识和租户管理员编辑新增租户角色字段

@@ -18,7 +18,9 @@
   import { UserDTO } from '/@/api/tenant/tenantInfo';
   import { ChineseRegexp, EmailRegexp, emailRule, phoneRule } from '/@/utils/rules';
   import { chineseAndEnlishRule } from '/@/utils/rules';
-  import { getAllRoleList } from '/@/api/system/system';
+  import { findCurrentUserRelation, getAllRoleList } from '/@/api/system/system';
+  import { RoleEnum } from '/@/enums/roleEnum';
+  import { RoleOrOrganizationParam } from '/@/api/system/model/systemModel';
 
   export default defineComponent({
     name: 'TenantAdminFormDrawer',
@@ -100,24 +102,29 @@
           component: 'Input',
           rules: phoneRule,
         },
-        {
-          field: 'email',
-          label: '邮件',
-          component: 'Input',
-          rules: emailRule,
-        },
+
         {
           field: 'roleIds',
           label: '租户角色',
           component: 'ApiSelect',
+          required: true,
           componentProps: {
             mode: 'multiple',
             api: getAllRoleList,
+            params: {
+              roleType: RoleEnum.TENANT_ADMIN,
+            },
             labelField: 'name',
             valueField: 'id',
           },
         },
         {
+          field: 'email',
+          label: '邮件',
+          component: 'Input',
+          rules: emailRule,
+        },
+        {
           field: 'enabled',
           label: '状态',
           required: true,
@@ -144,9 +151,12 @@
           tenantId.value = data?.tenantId;
           isJudgeUserNameExist.value = data.judgeExistUserName;
           if (unref(isUpdate)) {
+            const roleParams = new RoleOrOrganizationParam(data.record.id, true, false);
+            const roleIds = await findCurrentUserRelation(roleParams);
             await updateSchema({ field: 'username', componentProps: { disabled: true } });
             await setFieldsValue({
               ...data.record,
+              roleIds,
             });
           } else {
             await updateSchema({ field: 'username', componentProps: { disabled: false } });