diff --git a/healthlink-his-mobile/src/api/index.js b/healthlink-his-mobile/src/api/index.js index 854ca471b..7544699f7 100644 --- a/healthlink-his-mobile/src/api/index.js +++ b/healthlink-his-mobile/src/api/index.js @@ -17,7 +17,7 @@ service.interceptors.request.use(config => { service.interceptors.response.use( response => { const res = response.data - if (res.code === 401) { + if (res.code === 401 && !window.location.pathname.includes('/login')) { localStorage.removeItem('Admin-Token') localStorage.removeItem('userInfo') window.location.href = '/login' @@ -26,7 +26,7 @@ service.interceptors.response.use( return res }, error => { - if (error.response?.status === 401) { + if (error.response?.status === 401 && !window.location.pathname.includes('/login')) { localStorage.removeItem('Admin-Token') localStorage.removeItem('userInfo') window.location.href = '/login' @@ -37,8 +37,7 @@ service.interceptors.response.use( export const authApi = { login: (data) => service.post('/login', data, { headers: { isToken: false } }), - getTenants: (username) => service.get('/system/tenant/user-bind/' + username, { headers: { isToken: false } }), - getAllTenants: () => service.get('/system/tenant/page', { headers: { isToken: false }, params: { pageSize: 100 } }), + getTenants: (username) => service.get('/system/tenant/user-bind/' + (username || ''), { headers: { isToken: false } }), getInfo: () => service.get('/getInfo') } diff --git a/healthlink-his-mobile/src/views/Login.vue b/healthlink-his-mobile/src/views/Login.vue index 1ef88fa8a..a1d949208 100644 --- a/healthlink-his-mobile/src/views/Login.vue +++ b/healthlink-his-mobile/src/views/Login.vue @@ -42,10 +42,9 @@ const form = ref({ username: '', password: '', tenantId: '' }) const loadTenants = async () => { try { - const res = await authApi.getAllTenants() - if (res.code === 200) { - const list = res.data?.records || res.data || [] - tenantOptions.value = list.map(item => ({ label: item.tenantName, value: item.tenantId || item.id })) + const res = await authApi.getTenants('') + if (res.code === 200 && res.data) { + tenantOptions.value = res.data.map(item => ({ label: item.tenantName, value: item.id })) if (tenantOptions.value.length === 1) { form.value.tenantId = tenantOptions.value[0].value; currentTenantName.value = tenantOptions.value[0].label } } } catch (e) { console.error(e) }