From e4ee26bc0c958133951690575abe365a1419333b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= <norton618@163.com>
Date: Fri, 31 Oct 2025 16:57:25 +0800
Subject: [PATCH] fix (farm):
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 多租户登录
---
 .../module/system/service/tenant/TenantServiceImpl.java     | 6 +++++-
 .../yudao/module/system/service/user/AdminUserService.java  | 1 +
 .../module/system/service/user/AdminUserServiceImpl.java    | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java
index e8380a6e..056a433a 100755
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java
@@ -23,6 +23,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantPackageDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.dal.mysql.tenant.TenantMapper;
 import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum;
 import cn.iocoder.yudao.module.system.enums.permission.RoleTypeEnum;
@@ -104,7 +105,10 @@ public class TenantServiceImpl implements TenantService {
         List<TenantPackageDO> pList = tenantPackageService.getTenantPackageListByStatus(0);
         Map<Long, String> pMap = pList.stream().collect(Collectors.toMap(TenantPackageDO::getId, TenantPackageDO::getName, (v1, v2) -> v1));
 
-        List<TenantDO> tList = tenantMapper.selectList(TenantDO::getContactMobile,reqVO.getUsername());
+        List<AdminUserDO> uList = userService.getUserByMobileToList(reqVO.getUsername());
+        List<Long> ids = uList.stream().map(AdminUserDO::getTenantId).toList();
+
+        List<TenantDO> tList = tenantMapper.selectList(TenantDO::getId,ids);
         return tList.stream().map(t ->
              new TenantRespVO(
                      t.getId(),
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
index 7ab4b9b0..339d14a0 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
@@ -119,6 +119,7 @@ public interface AdminUserService {
      * @return 用户对象信息
      */
     AdminUserDO getUserByMobile(String mobile);
+    List<AdminUserDO> getUserByMobileToList(String mobile);
 
     /**
      * 获得用户分页列表
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
index 69effd17..1062df6f 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
@@ -332,6 +332,11 @@ public class AdminUserServiceImpl implements AdminUserService {
         return userMapper.selectByMobile(mobile);
     }
 
+    @Override
+    public List<AdminUserDO> getUserByMobileToList(String mobile) {
+        return userMapper.selectList(AdminUserDO::getMobile,mobile);
+    }
+
     @Override
     public PageResult<AdminUserDO> getUserPage(UserPageReqVO reqVO) {
         // 如果有角色编号，查询角色对应的用户编号