diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts index 75f6df0f..bea2d0fc 100644 --- a/src/config/axios/service.ts +++ b/src/config/axios/service.ts @@ -69,6 +69,11 @@ service.interceptors.request.use( config.headers['visit-tenant-id'] = visitTenantId } } + // 监狱系统:即使 tenantEnable 为 false,也尝试获取并设置租户 ID + const tenantId = getTenantId() + if (tenantId) { + config.headers['tenant-id'] = tenantId + } const method = config.method?.toUpperCase() // 防止 GET 请求缓存 if (method === 'GET') { diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue index 084b8090..1f8b82a2 100644 --- a/src/views/Login/components/LoginForm.vue +++ b/src/views/Login/components/LoginForm.vue @@ -226,6 +226,12 @@ const getTenantId = async () => { if (loginData.tenantEnable === 'true') { const res = await LoginApi.getTenantIdByName(loginData.loginForm.tenantName) authUtil.setTenantId(res) + } else { + // 监狱系统:直接使用租户名作为租户ID进行设置 + const tenantName = loginData.loginForm.tenantName + if (tenantName) { + authUtil.setTenantId(Number(tenantName)) + } } } // 记住我