diff --git a/healthlink-his-mobile/src/api/index.js b/healthlink-his-mobile/src/api/index.js index 7544699f7..a9f3336ae 100644 --- a/healthlink-his-mobile/src/api/index.js +++ b/healthlink-his-mobile/src/api/index.js @@ -37,7 +37,8 @@ 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 } }), + getTenants: () => service.get('/system/tenant/all-active', { headers: { isToken: false } }), + getUserTenants: (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 3bc2524ee..e0290b0d0 100644 --- a/healthlink-his-mobile/src/views/Login.vue +++ b/healthlink-his-mobile/src/views/Login.vue @@ -42,9 +42,9 @@ const form = ref({ username: '', password: '', tenantId: '' }) const loadTenants = async () => { try { - const res = await authApi.getTenants('') + const res = await authApi.getTenants() if (res.code === 200 && res.data) { - tenantOptions.value = res.data.map(item => ({ label: item.tenantName, value: item.id })) + tenantOptions.value = res.data.map(item => ({ label: item.tenantName, value: item.tenantId || item.id })) const savedTenantId = localStorage.getItem('selectedTenantId') const savedTenantName = localStorage.getItem('selectedTenantName') if (savedTenantId && tenantOptions.value.some(t => t.value == savedTenantId)) { diff --git a/healthlink-his-server/core-admin/src/main/java/com/core/web/controller/system/SysTenantController.java b/healthlink-his-server/core-admin/src/main/java/com/core/web/controller/system/SysTenantController.java index 71e51b161..faf7b78d1 100755 --- a/healthlink-his-server/core-admin/src/main/java/com/core/web/controller/system/SysTenantController.java +++ b/healthlink-his-server/core-admin/src/main/java/com/core/web/controller/system/SysTenantController.java @@ -194,4 +194,19 @@ public class SysTenantController extends BaseController { public R> getUserBindTenantList(@PathVariable String username) { return sysTenantService.getUserBindTenantList(username); } + + /** + * 查询所有可用租户列表(登录页使用,无需认证) + * + * @return 所有启用的租户列表 + */ + @Anonymous + @GetMapping("/all-active") + public R> getAllActiveTenants() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysTenant::getStatus, "0"); + wrapper.eq(SysTenant::getDelFlag, "0"); + wrapper.orderByAsc(SysTenant::getTenantId); + return R.ok(sysTenantService.list(wrapper)); + } } \ No newline at end of file