From 24373660937220f01364f80d5601ab581da82012 Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Fri, 19 Jun 2026 23:30:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(mobile):=20=E6=B7=BB=E5=8A=A0=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3+=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=8C=BB=E9=99=A2=E9=80=89=E6=8B=A9=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 healthlink-his-mobile/src/api/index.js            |  3 ++-
 healthlink-his-mobile/src/views/Login.vue         |  4 ++--
 .../controller/system/SysTenantController.java    | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

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<List<SysTenant>> getUserBindTenantList(@PathVariable String username) {
         return sysTenantService.getUserBindTenantList(username);
     }
+
+    /**
+     * 查询所有可用租户列表（登录页使用，无需认证）
+     *
+     * @return 所有启用的租户列表
+     */
+    @Anonymous
+    @GetMapping("/all-active")
+    public R<List<SysTenant>> getAllActiveTenants() {
+        LambdaQueryWrapper<SysTenant> 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