Merge branch 'fix/permission-issues-zfl' into 'main_dev'

fix: 还原租户管理员添加的字段

See merge request yunteng/thingskit-front!828

@@ -18,9 +18,6 @@
   import { UserDTO } from '/@/api/tenant/tenantInfo';
   import { ChineseRegexp, EmailRegexp, emailRule, phoneRule } from '/@/utils/rules';
   import { chineseAndEnlishRule } from '/@/utils/rules';
-  import { findCurrentUserRelation, getAllRoleList } from '/@/api/system/system';
-  import { RoleEnum } from '/@/enums/roleEnum';
-  import { RoleOrOrganizationParam } from '/@/api/system/model/systemModel';
 
   export default defineComponent({
     name: 'TenantAdminFormDrawer',
@@ -102,22 +99,6 @@
           component: 'Input',
           rules: phoneRule,
         },
-
-        {
-          field: 'roleIds',
-          label: '租户角色',
-          component: 'ApiSelect',
-          required: true,
-          componentProps: {
-            mode: 'multiple',
-            api: getAllRoleList,
-            params: {
-              roleType: RoleEnum.TENANT_ADMIN,
-            },
-            labelField: 'name',
-            valueField: 'id',
-          },
-        },
         {
           field: 'email',
           label: '邮件',
@@ -151,12 +132,9 @@
           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 } });
@@ -181,7 +159,6 @@
                 ? values.tenantExpireTime.format('YYYY-MM-DD HH:mm:ss')
                 : null,
             tenantId: tenantId.value,
-            roleIds: values.roleIds,
           };
           await saveTenantAdmin(requestParams as any as UserDTO);
           closeDrawer(); //关闭侧框