GTsoft/ruoyi-plus-soybean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复未开启租户报错问题

Browse Source
This commit is contained in:
xlsea 2025-05-16 20:36:34 +08:00
parent fc68a4d054
commit ef42e2f013
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/custom/tenant-select.vue
View File

@ -25,7 +25,7 @@ const { clearTabs } = useTabStore();
const { toHome } = useRouterPush(); const { toHome } = useRouterPush();
const tenantId = defineModel<CommonType.IdType>('tenantId', { required: false, default: undefined }); const tenantId = defineModel<CommonType.IdType>('tenantId', { required: false, default: undefined });
const enabled = defineModel<boolean>('enabled', { required: false, default: true }); const enabled = defineModel<boolean>('enabled', { required: false, default: false });
const lastSelected = ref<CommonType.IdType>(); const lastSelected = ref<CommonType.IdType>();
@ -71,12 +71,14 @@ async function handleFetchTenantList() {
const { data, error } = await fetchTenantList(); const { data, error } = await fetchTenantList();
if (error) return; if (error) return;
enabled.value = data.tenantEnabled; enabled.value = data.tenantEnabled;
tenantOption.value = data.voList.map(tenant => { if (data.tenantEnabled) {
return { tenantOption.value = data.voList.map(tenant => {
label: tenant.companyName, return {
value: tenant.tenantId label: tenant.companyName,
}; value: tenant.tenantId
}); };
});
}
endLoading(); endLoading();
} }
onMounted(async () => { onMounted(async () => {

4
src/views/_builtin/login/modules/pwd-login.vue
View File

@ -20,11 +20,11 @@ const { loading: codeLoading, startLoading: startCodeLoading, endLoading: endCod
const { loading: tenantLoading, startLoading: startTenantLoading, endLoading: endTenantLoading } = useLoading(); const { loading: tenantLoading, startLoading: startTenantLoading, endLoading: endTenantLoading } = useLoading();
const codeUrl = ref<string>(); const codeUrl = ref<string>();
const captchaEnabled = ref<boolean>(true); const captchaEnabled = ref<boolean>(false);
const registerEnabled = ref<boolean>(false); const registerEnabled = ref<boolean>(false);
const remberMe = ref<boolean>(false); const remberMe = ref<boolean>(false);
const tenantEnabled = ref<boolean>(true); const tenantEnabled = ref<boolean>(false);
const tenantOption = ref<SelectOption[]>([]); const tenantOption = ref<SelectOption[]>([]);