boor/wanmao-map-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix (farm):

Browse Source 
- 多租户登录
This commit is contained in:
达富斌
2025-10-31 16:57:25 +08:00
parent 51794ae12a
commit e4ee26bc0c
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java
View File

@@ -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(),

1
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
View File

@@ -119,6 +119,7 @@ public interface AdminUserService {
* @return 用户对象信息
*/
AdminUserDO getUserByMobile(String mobile);
List<AdminUserDO> getUserByMobileToList(String mobile);
/**
* 获得用户分页列表

5
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
View File

@@ -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) {
// 如果有角色编号，查询角色对应的用户编号